diff options
| author | Android Build Prod User <android-build-prod@system.gserviceaccount.com> | 2021-08-26 17:23:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-26 17:23:55 +0000 |
| commit | 757a2bc5bfb02e3dfa43ed3451e8d919cf9470d1 (patch) | |
| tree | 00e88584adb3c117133e6a14b2d02bd539df2716 /core/java/android/inputmethodservice/InputMethodService.java | |
| parent | edd9321b47919fb7a63538a8d2a9759021b41448 (diff) | |
| parent | cdda26f9c700f2291ec657d0183d95de52179e41 (diff) | |
Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-v2-dev am: cdda26f9c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15626298
Change-Id: I1081c13f067a571b18e4081183832ddf71010265
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 42fa9fbc7b94..c0f008122b4f 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -1732,12 +1732,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; |