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

Commit faec1367 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Prevents duplicated finishing activities" into main

parents 1ea97eea 65e4fafc
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -3027,7 +3027,11 @@ class TaskFragment extends WindowContainer<WindowContainer> {
        // The task order may be changed by finishIfPossible() for adjusting focus if there are
        // nested tasks, so add all activities into a list to avoid missed removals.
        final ArrayList<ActivityRecord> removingActivities = new ArrayList<>();
        forAllActivities((Consumer<ActivityRecord>) removingActivities::add);
        forAllActivities((r) -> {
            if (!r.finishing) {
                removingActivities.add(r);
            }
        });
        for (int i = removingActivities.size() - 1; i >= 0; --i) {
            final ActivityRecord r = removingActivities.get(i);
            if (withTransition && r.isVisible()) {