commit 6979ba4278b0f0c243fb39e7bcd63ca7fddfc97a
author Ming-Shin Lu <lumark@google.com> Sat May 13 00:39:13 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 13 00:39:13 2023 +0000
tree 578fb4ea85bcdb570abdb0bb72e3b8a207e77a39
parent 220244444654ec929ece945ba4c51e5c6298f6d6
parent d558f89afcc3d0c4f3c9d1b8021d7b6abcb774af

Merge "Fix a NPE in InputMonitor#updateInputFocusRequest" into udc-dev

services/core/java/com/android/server/wm/InputMonitor.java

diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java
index 0b960ec..b67ccd2 100644
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -439,7 +439,9 @@
                                 ? mDisplayContent.getImeInputTarget().getActivityRecord() : null;
                         if (app != null) {
                             mDisplayContent.removeImeSurfaceImmediately();
-                            mDisplayContent.mAtmService.takeTaskSnapshot(app.getTask().mTaskId);
+                            if (app.getTask() != null) {
+                                mDisplayContent.mAtmService.takeTaskSnapshot(app.getTask().mTaskId);
+                            }
                         }
                     } else {
                         // Disable IME icon explicitly when IME attached to the app in case