From fabbcd12476704e16c19a2f9b258f2270d5a4be5 Mon Sep 17 00:00:00 2001
From: Taran Singh <tarandeep@google.com>
Date: Wed, 18 Aug 2021 23:29:21 +0000
Subject: Fix NPE in IMS#onEvaluateFullscreenMode

Fix NPE when EditorInfo is null

Test: Manually using steps in bug
Fix: 197078413
Bug: 197258697

Change-Id: I7437dec66f2cfe7769b9448916998c40745c3ebc
---
 core/java/android/inputmethodservice/InputMethodService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/java/android/inputmethodservice/InputMethodService.java')

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;
-- 
cgit v1.2.3