aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-08-25 15:08:27 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-08-25 15:08:27 +0900
commitad1f88081190ad3c5569b2774c03e644786770d2 (patch)
treec0f411fcd3319e5420cb3069e9a4a5068e951d5e /java/src
parent5e7a6fe09824a5d1ba875bc5aaed183cb1a0bc27 (diff)
downloadlatinime-ad1f88081190ad3c5569b2774c03e644786770d2.tar.gz
latinime-ad1f88081190ad3c5569b2774c03e644786770d2.tar.xz
latinime-ad1f88081190ad3c5569b2774c03e644786770d2.zip
Fix NPE when pressing ALT key
Bug: 17203708 Change-Id: I4f203603496e9401dacba4db21372e3353916418
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 140e76879..77cdf49fb 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -261,6 +261,9 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
}
public void onToggleEmojiKeyboard() {
+ if (mKeyboardLayoutSet == null) {
+ return;
+ }
if (isShowingEmojiPalettes()) {
setAlphabetKeyboard();
} else {