commit 4a782da382b83164ea5c23c771b771e73bbe31b3
author Tadashi G. Takaoka <takaoka@google.com> Mon Aug 25 07:11:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 25 07:11:12 2014 +0000
tree d78d2118e3f6d4059af3e714e3381e02b3f70f3a
parent 2d508203c64f50ed47fb87c24ae5ebbfb0610a36
parent f145fff0855cedb83551021c7682e05e1783f5b2

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

* commit 'f145fff0855cedb83551021c7682e05e1783f5b2':
  Fix NPE when pressing ALT key

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 {