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

Commit 1748ccf3 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Do not create starting window if there is no task." into tm-dev am: 33e3f60e 

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



Change-Id: Ibea90b780f825f3cf050ebbdc30ec7b5ae18715b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e36fb6e5 33e3f60e

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.