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

Commit e97281b9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19562833] into tm-d1-release. 

Change-Id: I855d3ecf2e65f1a1db16ff75cb614b33c2794492
parents 51b4a6c8 15ee7610

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.