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

Commit 4dc2b913 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Fix possible NPE in KeyboardSwitcher"

parents 68bc4ba5 adbb979b

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