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

* commit 'f145fff0855cedb83551021c7682e05e1783f5b2': Fix NPE when pressing ALT key
2014-08-25 07:11:12 +00:00 · 2014-08-25 07:11:12 +00:00 · 4a782da382
parent 2d508203c6 f145fff085
commit 4a782da382
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 {