am 4dc2b913: Merge "Fix possible NPE in KeyboardSwitcher"

* commit '4dc2b9131f48df86e071e5ecfc8db7cd408b154e': Fix possible NPE in KeyboardSwitcher
2013-09-27 09:54:38 -07:00 · 2013-09-27 09:54:38 -07:00 · 36301d555f
parent ecc1408e33 4dc2b9131f
commit 36301d555f
1 changed files with 1 additions and 1 deletions
--- 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() {