diff options
| author | Taran Singh <tarandeep@google.com> | 2021-08-18 23:29:21 +0000 |
|---|---|---|
| committer | Taran Singh <tarandeep@google.com> | 2021-08-19 21:54:44 +0000 |
| commit | fabbcd12476704e16c19a2f9b258f2270d5a4be5 (patch) | |
| tree | 98818b2faaf2db7e34db650910ba2ee3f0648706 /core/java/android/inputmethodservice/InputMethodService.java | |
| parent | 8e97f2206819f644fe2d1e195b1cd0fe9715f2ce (diff) | |
Fix NPE in IMS#onEvaluateFullscreenMode
Fix NPE when EditorInfo is null
Test: Manually using steps in bug
Fix: 197078413
Bug: 197258697
Change-Id: I7437dec66f2cfe7769b9448916998c40745c3ebc
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; |