| commit | 7defe926ca0eed2a18665cd0e4bf2ec305a03879 | [log] [tgz] |
|---|---|---|
| author | Tadashi G. Takaoka <takaoka@google.com> | Mon Aug 25 08:25:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 25 08:25:42 2014 +0000 |
| tree | 9c56a968fecbfe6387c824864d5e2631e2797feb | |
| parent | 4587b135be7f184bdf60f8e4113e81070ce2d825 [diff] | |
| parent | 4a782da382b83164ea5c23c771b771e73bbe31b3 [diff] |
am 4a782da3: am f145fff0: Merge "Fix NPE when pressing ALT key" into lmp-dev * commit '4a782da382b83164ea5c23c771b771e73bbe31b3': Fix NPE when pressing ALT key
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 {