commit ad1f88081190ad3c5569b2774c03e644786770d2
author Tadashi G. Takaoka <takaoka@google.com> Mon Aug 25 15:08:27 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Aug 25 15:08:27 2014 +0900
tree c0f411fcd3319e5420cb3069e9a4a5068e951d5e
parent 5e7a6fe09824a5d1ba875bc5aaed183cb1a0bc27

Fix NPE when pressing ALT key

Bug: 17203708
Change-Id: I4f203603496e9401dacba4db21372e3353916418

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 {