Merge "Do not create starting window if there is no task." into tm-d1-dev am: 75d87d2fdb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19562833

Change-Id: I992677b7c710c1803f70f799c98fcb08bd0f6365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Saul Su
2022-08-11 02:31:30 +00:00
committed by Automerger Merge Worker

View File

@@ -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.