diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-09-27 16:52:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-27 16:52:32 +0000 |
| commit | 4dc2b9131f48df86e071e5ecfc8db7cd408b154e (patch) | |
| tree | 0089b5c0cc51435cb40d593a9c2ebf7dcf773ed0 /java/src/com/android | |
| parent | 68bc4ba5c2e53ad4f40e809e5c4c30df85008bda (diff) | |
| parent | adbb979b5687c1eaffc9388e270e744a5abc075a (diff) | |
Merge "Fix possible NPE in KeyboardSwitcher"
Diffstat (limited to 'java/src/com/android')
| -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() { |