Merge "Add null check in IMS hideWindow" into rvc-dev

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 2cafcdb9f4aa..c2ee21d5115d 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -2284,7 +2284,9 @@ public class InputMethodService extends AbstractInputMethodService {
             // When insets API is enabled, it is responsible for client and server side
             // visibility of IME window.
             if (isVisibilityAppliedUsingInsetsConsumer()) {
-                mInputView.dispatchWindowVisibilityChanged(View.GONE);
+                if (mInputView != null) {
+                    mInputView.dispatchWindowVisibilityChanged(View.GONE);
+                }
             } else {
                 mWindow.hide();
             }