commit 29c8fea77858f7aa6e5b90fc02823ea4e4ca021c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 10 13:06:16 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 10 13:06:16 2023 +0000
tree fe31eb748e1d1dcb2aea454dc6f5f6638cfc076b
parent a63eeff008f37930e2076dd6cae421fc27333dc7
parent 9cc9e483e0f6df5eb35af9943d4b70e9bfaf4b27

Merge "Add null pointer judgment processing to prevent restarting" into main

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

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 91c0c69..bda0a0f 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -5748,7 +5748,7 @@
                 false /* deferResume */);
 
         ActivityRecord topActivity = getDisplayArea().topRunningActivity();
-        Task topRootTask = topActivity.getRootTask();
+        Task topRootTask = topActivity == null ? null : topActivity.getRootTask();
         if (topRootTask != null && topRootTask != this && topActivity.isState(RESUMED)) {
             // Usually resuming a top activity triggers the next app transition, but nothing's got
             // resumed in this case, so we need to execute it explicitly.