am 523d6090: am 36301d55: am 4dc2b913: Merge "Fix possible NPE in KeyboardSwitcher"

* commit '523d60902ea5e4c773ee31755ea4e9703cde345d':
  Fix possible NPE in KeyboardSwitcher
This commit is contained in:
Satoshi Kataoka 2013-10-03 15:37:42 -07:00 committed by Android Git Automerger
commit 641662ca31

View file

@ -315,7 +315,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
}
public boolean isShowingEmojiKeyboard() {
return mEmojiKeyboardView.getVisibility() == View.VISIBLE;
return mEmojiKeyboardView != null && mEmojiKeyboardView.getVisibility() == View.VISIBLE;
}
public boolean isShowingMoreKeysPanel() {