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

Commit 515754ed authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix starting window did not transfer to starting activity." into... 

Merge "Fix starting window did not transfer to starting activity." into rvc-dev am: 94be6df3 am: a2cba159 am: 843ca201 am: 1098dde9

Change-Id: Iba04e86fda86d398cb149a44bac382154f3eb55a
parents ecff9e63 1098dde9

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

+3 −1
Original line number Diff line number Diff line
@@ -2393,8 +2393,10 @@ class ActivityStack extends Task { 
        }

        Task task = null;

        if (!newTask && isOrhasTask) {

            // Starting activity cannot be occluding activity, otherwise starting window could be

            // remove immediately without transferring to starting activity.

            final ActivityRecord occludingActivity = getActivity(

                    (ar) -> !ar.finishing && ar.occludesParent(), true, rTask);

                    (ar) -> !ar.finishing && ar.occludesParent(), true, r);

            if (occludingActivity != null) {

                // Here it is!  Now, if this is not yet visible (occluded by another task) to the

                // user, then just add it without starting; it will get started when the user