commit f145fff0855cedb83551021c7682e05e1783f5b2
author Tadashi G. Takaoka <takaoka@google.com> Mon Aug 25 06:52:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 25 06:52:36 2014 +0000
tree edeb9ab1ca107d7bb27d32a0eea20eabcad4c377
parent 8681287cd65f9d96187aab0703121881c8eba6c6
parent ad1f88081190ad3c5569b2774c03e644786770d2

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

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 140e768..77cdf49 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -261,6 +261,9 @@
     }
 
     public void onToggleEmojiKeyboard() {
+        if (mKeyboardLayoutSet == null) {
+            return;
+        }
         if (isShowingEmojiPalettes()) {
             setAlphabetKeyboard();
         } else {