commit 33e3f60e06fbeeba49854539ef7fb00900b9ec65
author Wei Sheng Shih <wilsonshih@google.com> Wed Aug 17 06:23:15 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 17 06:23:15 2022 +0000
tree 819f7a660b1d95db59d6c7fe23659fa4ba90a013
parent e1e8b1b9325698c8f731faaad447ba906132add6
parent f5909156007fb7976c34ec187a68792d92a6edc2

Merge "Do not create starting window if there is no task." into tm-dev

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

diff --git a/services/core/java/com/android/server/wm/StartingSurfaceController.java b/services/core/java/com/android/server/wm/StartingSurfaceController.java
index f83173b..0bb773a 100644
--- a/services/core/java/com/android/server/wm/StartingSurfaceController.java
+++ b/services/core/java/com/android/server/wm/StartingSurfaceController.java
@@ -220,6 +220,11 @@
         // Attempt to add starting window from the top-most activity.
         for (int i = mDeferringAddStartActivities.size() - 1; i >= 0; --i) {
             final DeferringStartingWindowRecord next = mDeferringAddStartActivities.get(i);
+            if (next.mDeferring.getTask() == null) {
+                Slog.e(TAG, "No task exists: " + next.mDeferring.shortComponentName
+                        + " parent: " + next.mDeferring.getParent());
+                continue;
+            }
             next.mDeferring.showStartingWindow(next.mPrev, mInitNewTask, mInitTaskSwitch,
                     mInitProcessRunning, true /* startActivity */, next.mSource, topOptions);
             // If one succeeds, it is done.