commit dc8992c4b0f67cde919a79fdaef32f70b4bb1c0f
author Louis Chang <louischang@google.com> Fri Mar 24 03:06:54 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 24 03:06:54 2023 +0000
tree 0e2a8049f0e3edfc1fb890408beffdd85d73c9b6
parent 26994f4d2e7332fa49c3aa6b7e72bcaa582e56e4
parent 92a26b6f51b5f303cdcdaeab824e109b3dddc32e

Merge "Fix IndexOutOfBoundsException while handle app crash" into udc-dev

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

diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java
index 8685723..c34aa2b 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -378,8 +378,9 @@
     }
 
     void handleAppCrash() {
-        for (int i = mActivities.size() - 1; i >= 0; --i) {
-            final ActivityRecord r = mActivities.get(i);
+        ArrayList<ActivityRecord> activities = new ArrayList<>(mActivities);
+        for (int i = activities.size() - 1; i >= 0; --i) {
+            final ActivityRecord r = activities.get(i);
             Slog.w(TAG, "  Force finishing activity "
                     + r.mActivityComponent.flattenToShortString());
             r.detachFromProcess();