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

Commit 24697fe3 authored by wilsonshih's avatar wilsonshih
Browse files

Do not create starting window if there is no task. 

Do not add starting window on the activity if no task exists in
the activity.
Also add an error log for the activity without task.

Bug: 233153876
Test: atest SplashscreenTests ActivityRecordTests
Change-Id: Iea264cd8b605443c695165c1136d56b86ffd4eb1
parent 39cf0dcd

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

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