am 523d6090: am 36301d55: am 4dc2b913: Merge "Fix possible NPE in KeyboardSwitcher"

* commit '523d60902ea5e4c773ee31755ea4e9703cde345d': Fix possible NPE in KeyboardSwitcher
2013-10-03 15:37:42 -07:00 · 2013-10-03 15:37:42 -07:00 · 641662ca31
parent a343e80adc 523d60902e
commit 641662ca31
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() {