From 6578ad17cab67767f0770b88990145d57f705d5f Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Tue, 24 Sep 2013 17:12:46 -0700 Subject: [PATCH] Don't crash when no alarms are scheduled Backing until you hear glass is generally contraindicated. Bug 10056484 Change-Id: Ie1331fbbc5fbb5d6384a6cfc975aa1840a5c9a2d --- services/java/com/android/server/AlarmManagerService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/java/com/android/server/AlarmManagerService.java b/services/java/com/android/server/AlarmManagerService.java index bb6c4e6ba3a5d..04d6332d34c97 100644 --- a/services/java/com/android/server/AlarmManagerService.java +++ b/services/java/com/android/server/AlarmManagerService.java @@ -1016,12 +1016,11 @@ class AlarmManagerService extends IAlarmManager.Stub { private native int setKernelTimezone(int fd, int minuteswest); private void triggerAlarmsLocked(ArrayList triggerList, long nowELAPSED, long nowRTC) { - Batch batch; - // batches are temporally sorted, so we need only pull from the // start of the list until we either empty it or hit a batch // that is not yet deliverable - while ((batch = mAlarmBatches.get(0)) != null) { + while (mAlarmBatches.size() > 0) { + Batch batch = mAlarmBatches.get(0); if (batch.start > nowELAPSED) { // Everything else is scheduled for the future break;