Add null check when ActivityRecord is refetched

Fixes: 64937756

Test: nothing bad happens
Change-Id: Id88d8522586031dbe987d382ed859686bed05797

1 files changed, 4 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 45387bd4b363..45dcbef84533 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -13078,6 +13078,10 @@ public class ActivityManagerService extends IActivityManager.Stub
                             + " couldn't be found");
                     return null;
                 }
+                if (activity.app == null || activity.app.thread == null) {
+                    Slog.w(TAG, "enqueueAssistContext failed: no process for " + activity);
+                    return null;
+                }
             }
 
             PendingAssistExtras pae;