am f145fff0: Merge "Fix NPE when pressing ALT key" into lmp-dev

* commit 'f145fff0855cedb83551021c7682e05e1783f5b2':
  Fix NPE when pressing ALT key
This commit is contained in:
Tadashi G. Takaoka 2014-08-25 07:11:12 +00:00 committed by Android Git Automerger
commit 4a782da382

View file

@ -261,6 +261,9 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
} }
public void onToggleEmojiKeyboard() { public void onToggleEmojiKeyboard() {
if (mKeyboardLayoutSet == null) {
return;
}
if (isShowingEmojiPalettes()) { if (isShowingEmojiPalettes()) {
setAlphabetKeyboard(); setAlphabetKeyboard();
} else { } else {