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

Commit 7deea106 authored by Android Build Prod User's avatar Android Build Prod User Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-v2-dev am: cdda26f9 am: 757a2bc5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15626298

Change-Id: I787b865c659c0c9ccf9947bf76236a282a07e612
parents a433d4e5 757a2bc5

core/java/android/inputmethodservice/InputMethodService.java

+3 −3
Original line number Diff line number Diff line
@@ -1731,12 +1731,12 @@ public class InputMethodService extends AbstractInputMethodService { 
        if (config.orientation != Configuration.ORIENTATION_LANDSCAPE) {

            return false;

        }

        if ((mInputEditorInfo != null

                && (mInputEditorInfo.imeOptions & EditorInfo.IME_FLAG_NO_FULLSCREEN) != 0)

        if (mInputEditorInfo != null

                && ((mInputEditorInfo.imeOptions & EditorInfo.IME_FLAG_NO_FULLSCREEN) != 0

                // If app window has portrait orientation, regardless of what display orientation

                // is, IME shouldn't use fullscreen-mode.

                || (mInputEditorInfo.internalImeOptions

                        & EditorInfo.IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT) != 0) {

                        & EditorInfo.IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT) != 0)) {

            return false;

        }

        return true;