diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-09-28 01:19:18 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2013-09-28 01:19:18 +0900 |
| commit | adbb979b5687c1eaffc9388e270e744a5abc075a (patch) | |
| tree | 5eaef120286a91cb0e303e48e1c450a7c8a2ce45 /java | |
| parent | 5f8eba02d0c42a8e6e3dbc272d2a6156c6a74d3b (diff) | |
| download | latinime-adbb979b5687c1eaffc9388e270e744a5abc075a.tar.gz latinime-adbb979b5687c1eaffc9388e270e744a5abc075a.tar.xz latinime-adbb979b5687c1eaffc9388e270e744a5abc075a.zip | |
Fix possible NPE in KeyboardSwitcher
Bug: 10964306
Change-Id: Ibcea76da746f6cac92c8d91425d25d04ade62af0
Diffstat (limited to 'java')
| -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() { |