diff options
| author | 2022-08-17 06:52:55 +0000 | |
|---|---|---|
| committer | 2022-08-17 06:52:55 +0000 | |
| commit | 1748ccf3decbf19942bc121c40b092864025d331 (patch) | |
| tree | 8eb731493083117e5c1c4383ac9ec58b73061e50 | |
| parent | e36fb6e5f5f0fcff35118ae69a1fa043f015f615 (diff) | |
| parent | 33e3f60e06fbeeba49854539ef7fb00900b9ec65 (diff) | |
Merge "Do not create starting window if there is no task." into tm-dev am: 33e3f60e06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18555351
Change-Id: Ibea90b780f825f3cf050ebbdc30ec7b5ae18715b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/StartingSurfaceController.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/StartingSurfaceController.java b/services/core/java/com/android/server/wm/StartingSurfaceController.java index f83173bd46c0..0bb773ae5e41 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 @@ public class StartingSurfaceController { // 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. |