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

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

Browse Source
This commit is contained in:
Treehugger Robot
2020-12-23 20:38:08 +00:00
committed by Gerrit Code Review
parent 5d3b26484c 5504a25a6f
commit 06550c33ba
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/AlarmManagerService.java
View File

@@ -3369,7 +3369,9 @@ class AlarmManagerService extends SystemService {
if (mMaxDelayTime < thisDelayTime) { if (mMaxDelayTime < thisDelayTime) {
mMaxDelayTime = thisDelayTime; mMaxDelayTime = thisDelayTime;
} }
deliverAlarmsLocked(mPendingNonWakeupAlarms, nowELAPSED); ArrayList<Alarm> triggerList =
(ArrayList<Alarm>) mPendingNonWakeupAlarms.clone();
deliverAlarmsLocked(triggerList, nowELAPSED);
mPendingNonWakeupAlarms.clear(); mPendingNonWakeupAlarms.clear();
} }
if (mNonInteractiveStartTime > 0) { if (mNonInteractiveStartTime > 0) {