Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06550c33 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 5d3b2648 5504a25a

services/core/java/com/android/server/AlarmManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -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) {