Merge "RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver"

2020-12-23 20:38:08 +00:00
parent 5d3b26484c 5504a25a6f
commit 06550c33ba
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -3369,7 +3369,9 @@ class AlarmManagerService extends SystemService {
                    if (mMaxDelayTime < thisDelayTime) {
                        mMaxDelayTime = thisDelayTime;
                    }
-                    deliverAlarmsLocked(mPendingNonWakeupAlarms, nowELAPSED);
+                    ArrayList<Alarm> triggerList =
+                            (ArrayList<Alarm>) mPendingNonWakeupAlarms.clone();
+                    deliverAlarmsLocked(triggerList, nowELAPSED);
                    mPendingNonWakeupAlarms.clear();
                }
                if (mNonInteractiveStartTime > 0) {