nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit '36301d555fb48b460ec64f2e771fb5301daa5510':
  Fix possible NPE in KeyboardSwitcher
main
Satoshi Kataoka 2013-10-03 12:17:23 -07:00 committed by Android Git Automerger
parent c9b9c2a318 36301d555f
commit 523d60902e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
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() {