diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-08-25 07:11:12 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 07:11:12 +0000 |
| commit | 4a782da382b83164ea5c23c771b771e73bbe31b3 (patch) | |
| tree | d78d2118e3f6d4059af3e714e3381e02b3f70f3a /java/src | |
| parent | 2d508203c64f50ed47fb87c24ae5ebbfb0610a36 (diff) | |
| parent | f145fff0855cedb83551021c7682e05e1783f5b2 (diff) | |
| download | latinime-4a782da382b83164ea5c23c771b771e73bbe31b3.tar.gz latinime-4a782da382b83164ea5c23c771b771e73bbe31b3.tar.xz latinime-4a782da382b83164ea5c23c771b771e73bbe31b3.zip | |
am f145fff0: Merge "Fix NPE when pressing ALT key" into lmp-dev
* commit 'f145fff0855cedb83551021c7682e05e1783f5b2':
Fix NPE when pressing ALT key
Diffstat (limited to 'java/src')
| -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 { |