diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-03 12:17:23 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 12:17:23 -0700 |
| commit | 523d60902ea5e4c773ee31755ea4e9703cde345d (patch) | |
| tree | 315f2fe72aa52749fdba3e8b7f5d4f7bf9694ca3 /java/src | |
| parent | c9b9c2a318c5cf66d6a08e5b668c0c1ed5cf3033 (diff) | |
| parent | 36301d555fb48b460ec64f2e771fb5301daa5510 (diff) | |
| download | latinime-523d60902ea5e4c773ee31755ea4e9703cde345d.tar.gz latinime-523d60902ea5e4c773ee31755ea4e9703cde345d.tar.xz latinime-523d60902ea5e4c773ee31755ea4e9703cde345d.zip | |
am 36301d55: am 4dc2b913: Merge "Fix possible NPE in KeyboardSwitcher"
* commit '36301d555fb48b460ec64f2e771fb5301daa5510':
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() { |