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

Commit a97fc79a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-qpr1-dev am: 5d99f25c 

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

Change-Id: Ia36e5713e8e4873b6803c990fd708b6e9494a3a5
parents 9ad4e569 5d99f25c

core/java/android/inputmethodservice/InputMethodService.java

+3 −3
Original line number Diff line number Diff line
@@ -1749,12 +1749,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;