Merge "Fix NPE when pressing ALT key" into lmp-dev

2014-08-25 06:52:36 +00:00 · 2014-08-25 06:52:36 +00:00 · f145fff085
parent 8681287cd6 ad1f880811
commit f145fff085
1 changed files with 3 additions and 0 deletions
--- 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 {