Merge "Fix possible NPE in KeyboardSwitcher"

This commit is contained in:
Satoshi Kataoka 2013-09-27 16:52:31 +00:00 committed by Android (Google) Code Review
commit 4dc2b9131f

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