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

* commit '4a782da382b83164ea5c23c771b771e73bbe31b3': Fix NPE when pressing ALT key
2014-08-25 08:25:42 +00:00 · 2014-08-25 08:25:42 +00:00 · 7defe926ca
parent 4587b135be 4a782da382
commit 7defe926ca
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 {