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

Commit dd28259d authored by Saul Su's avatar Saul Su Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I992677b7c710c1803f70f799c98fcb08bd0f6365
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 655dce3b 75d87d2f

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

+5 −0
Original line number Diff line number Diff line
@@ -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.