Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in IMS#onEvaluateFullscreenMode" into sc-v2-dev

Browse Source
This commit is contained in:
Android Build Prod User
2021-08-26 17:16:10 +00:00
committed by Android (Google) Code Review
parent efa4aca7d3 fabbcd1247
commit cdda26f9c7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/inputmethodservice/InputMethodService.java
View File

@@ -1732,12 +1732,12 @@ public class InputMethodService extends AbstractInputMethodService {
if (config.orientation != Configuration.ORIENTATION_LANDSCAPE) { if (config.orientation != Configuration.ORIENTATION_LANDSCAPE) {
return false; return false;
} }
if ((mInputEditorInfo != null if (mInputEditorInfo != null
&& (mInputEditorInfo.imeOptions & EditorInfo.IME_FLAG_NO_FULLSCREEN) != 0) && ((mInputEditorInfo.imeOptions & EditorInfo.IME_FLAG_NO_FULLSCREEN) != 0
// If app window has portrait orientation, regardless of what display orientation // If app window has portrait orientation, regardless of what display orientation
// is, IME shouldn't use fullscreen-mode. // is, IME shouldn't use fullscreen-mode.
|| (mInputEditorInfo.internalImeOptions || (mInputEditorInfo.internalImeOptions
& EditorInfo.IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT) != 0) { & EditorInfo.IME_INTERNAL_FLAG_APP_WINDOW_PORTRAIT) != 0)) {
return false; return false;
} }
return true; return true;