| commit | 7deea106e457c5541817497ae2691c508bcd4f8f | [log] [tgz] |
|---|---|---|
| author | Android Build Prod User <android-build-prod@system.gserviceaccount.com> | Thu Aug 26 17:38:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 26 17:38:18 2021 +0000 |
| tree | d09998b05324473e0df8e1387c88b1a89cdfacff | |
| parent | a433d4e5e376f9ca3c262fdada09e92c99fa5fd0 [diff] | |
| parent | 757a2bc5bfb02e3dfa43ed3451e8d919cf9470d1 [diff] |
Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-v2-dev am: cdda26f9c7 am: 757a2bc5bf Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15626298 Change-Id: I787b865c659c0c9ccf9947bf76236a282a07e612
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index dadea67..4255d88 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -1731,12 +1731,12 @@ 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;