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

f145fff0 · Tadashi G. Takaoka · Android (Google) Code Review · 8681287c · ad1f8808 · f145fff0
Commit f145fff0 authored 10 years ago by Tadashi G. Takaoka Committed by Android (Google) Code Review 10 years ago
--- 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 {