Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent IndexOutOfBoundsException while removing activities" into tm-qpr-dev

Browse Source
This commit is contained in:
Louis Chang
2022-12-12 00:36:01 +00:00
committed by Android (Google) Code Review
parent 9e7dc1926a 2f821c9001
commit c554885157
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/Task.java
View File

@@ -1612,10 +1612,18 @@ class Task extends TaskFragment {
// removed. Otherwise, shell transitions wouldn't run because there would be no event // removed. Otherwise, shell transitions wouldn't run because there would be no event
// that sets the transition ready. // that sets the transition ready.
final boolean traverseTopToBottom = !mTransitionController.isShellTransitionsEnabled(); final boolean traverseTopToBottom = !mTransitionController.isShellTransitionsEnabled();
forAllActivities((r) -> { final ArrayList<ActivityRecord> finishingActivities = new ArrayList<>();
forAllActivities(r -> {
if (r.finishing || (excludingTaskOverlay && r.isTaskOverlay())) { if (r.finishing || (excludingTaskOverlay && r.isTaskOverlay())) {
return; return;
} }
finishingActivities.add(r);
}, traverseTopToBottom);
for (int i = 0; i < finishingActivities.size(); i++) {
final ActivityRecord r = finishingActivities.get(i);
// Prevent the transition from being executed too early if the top activity is // Prevent the transition from being executed too early if the top activity is
// resumed but the mVisibleRequested of any other activity is true, the transition // resumed but the mVisibleRequested of any other activity is true, the transition
// should wait until next activity resumed. // should wait until next activity resumed.
@@ -1625,7 +1633,7 @@ class Task extends TaskFragment {
} else { } else {
r.destroyIfPossible(reason); r.destroyIfPossible(reason);
} }
}, traverseTopToBottom); }
} }
} }