diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-09-27 09:54:38 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-09-27 09:54:38 -0700 |
| commit | 36301d555fb48b460ec64f2e771fb5301daa5510 (patch) | |
| tree | 6a19bd5de1c4685a1eff55355f06726f8e9d8f69 /java/src | |
| parent | ecc1408e33fa702260dfc47cdb75e510354018fd (diff) | |
| parent | 4dc2b9131f48df86e071e5ecfc8db7cd408b154e (diff) | |
| download | latinime-36301d555fb48b460ec64f2e771fb5301daa5510.tar.gz latinime-36301d555fb48b460ec64f2e771fb5301daa5510.tar.xz latinime-36301d555fb48b460ec64f2e771fb5301daa5510.zip | |
am 4dc2b913: Merge "Fix possible NPE in KeyboardSwitcher"
* commit '4dc2b9131f48df86e071e5ecfc8db7cd408b154e':
Fix possible NPE in KeyboardSwitcher
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index cc1ffd183..74edd87cf 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -315,7 +315,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { } public boolean isShowingEmojiKeyboard() { - return mEmojiKeyboardView.getVisibility() == View.VISIBLE; + return mEmojiKeyboardView != null && mEmojiKeyboardView.getVisibility() == View.VISIBLE; } public boolean isShowingMoreKeysPanel() { |