am 4dc2b913: Merge "Fix possible NPE in KeyboardSwitcher"

* commit '4dc2b9131f48df86e071e5ecfc8db7cd408b154e':
  Fix possible NPE in KeyboardSwitcher
This commit is contained in:
Satoshi Kataoka 2013-09-27 09:54:38 -07:00 committed by Android Git Automerger
commit 36301d555f

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() {