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

Commit 94be6df3 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

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

parents ae062e92 e103b773
Loading
Loading
Loading
Loading
+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