Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 641662ca authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

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

* commit '523d6090':
  Fix possible NPE in KeyboardSwitcher
parents a343e80a 523d6090

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+1 −1
Original line number Diff line number Diff line
@@ -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() {