diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-08-25 09:10:40 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 09:10:40 +0000 |
| commit | ca9e970c7c992c817fdb4ecd2b59ef56f7e30c4b (patch) | |
| tree | 545db48b339fdefb45df05cf60a54080d168431a /java | |
| parent | 8787d7f154190edfbbe51334db34083e5fd21ecc (diff) | |
| parent | 7defe926ca0eed2a18665cd0e4bf2ec305a03879 (diff) | |
| download | latinime-ca9e970c7c992c817fdb4ecd2b59ef56f7e30c4b.tar.gz latinime-ca9e970c7c992c817fdb4ecd2b59ef56f7e30c4b.tar.xz latinime-ca9e970c7c992c817fdb4ecd2b59ef56f7e30c4b.zip | |
am 7defe926: am 4a782da3: am f145fff0: Merge "Fix NPE when pressing ALT key" into lmp-dev
* commit '7defe926ca0eed2a18665cd0e4bf2ec305a03879':
Fix NPE when pressing ALT key
Diffstat (limited to 'java')
| -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 { |