Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 050781d7 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

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

parents d13e721d 24697fe3
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -223,6 +223,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.