am 7defe926: am 4a782da3: am f145fff0: Merge "Fix NPE when pressing ALT key" into lmp-dev

* commit '7defe926ca0eed2a18665cd0e4bf2ec305a03879': Fix NPE when pressing ALT key
2014-08-25 09:10:40 +00:00 · 2014-08-25 09:10:40 +00:00 · ca9e970c7c
parent 8787d7f154 7defe926ca
commit ca9e970c7c
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 {