diff options
| author | 2020-12-23 21:22:16 +0000 | |
|---|---|---|
| committer | 2020-12-23 21:22:16 +0000 | |
| commit | 218670e0959115b4bf50b74cf2437d24f2cec104 (patch) | |
| tree | 585ce915c61bf97229fad48f147580e643074465 | |
| parent | 90a64f700249dab2c59ec09228cb3b35ef00907e (diff) | |
| parent | 5504a25a6f3cfcd7d13dbee86beb3cddc80ef770 (diff) | |
RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver am: 5504a25a6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471525
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5199a2e3004547d2728c32b733a43106382ad023
| -rw-r--r-- | services/core/java/com/android/server/AlarmManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index 651f941be0b1..d09f44fdeb4d 100644 --- 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) { |