commit 4dc2b9131f48df86e071e5ecfc8db7cd408b154e
author Satoshi Kataoka <satok@google.com> Fri Sep 27 16:52:31 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 27 16:52:32 2013 +0000
tree 0089b5c0cc51435cb40d593a9c2ebf7dcf773ed0
parent 68bc4ba5c2e53ad4f40e809e5c4c30df85008bda
parent adbb979b5687c1eaffc9388e270e744a5abc075a

Merge "Fix possible NPE in KeyboardSwitcher"

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index cc1ffd1..74edd87 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -315,7 +315,7 @@
     }
 
     public boolean isShowingEmojiKeyboard() {
-        return mEmojiKeyboardView.getVisibility() == View.VISIBLE;
+        return mEmojiKeyboardView != null && mEmojiKeyboardView.getVisibility() == View.VISIBLE;
     }
 
     public boolean isShowingMoreKeysPanel() {