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

Commit e103b773 authored by wilsonshih's avatar wilsonshih
Browse files

Fix starting window did not transfer to starting activity. 

The starting activity was been mis-judged as occluding activity,
thus did not transfer starting window to the starting activity.

Bug: 150298988
Test: ActivityStackTests
Change-Id: I045b3416f8b887754aea27b6371e116c6d23852d
parent ea494a7c

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

+3 −1
Original line number Diff line number Diff line
@@ -2395,8 +2395,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