diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2014-08-25 06:52:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-25 06:52:36 +0000 |
| commit | f145fff0855cedb83551021c7682e05e1783f5b2 (patch) | |
| tree | edeb9ab1ca107d7bb27d32a0eea20eabcad4c377 /java/src/com | |
| parent | 8681287cd65f9d96187aab0703121881c8eba6c6 (diff) | |
| parent | ad1f88081190ad3c5569b2774c03e644786770d2 (diff) | |
Merge "Fix NPE when pressing ALT key" into lmp-dev
Diffstat (limited to 'java/src/com')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 140e76879..77cdf49fb 100644 --- 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 { |