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

RESTRICT AUTOMERGE Prevent size of list changes during mPendingNonWakeupAlarms deliver am: 5504a25a6f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5199a2e3004547d2728c32b733a43106382ad023
This commit is contained in:
Juneup Park
2020-12-23 21:22:16 +00:00
committed by Automerger Merge Worker
parent 90a64f7002 5504a25a6f
commit 218670e095
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) {