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

Merge "Don't crash when no alarms are scheduled" into klp-dev

Browse Source
This commit is contained in:
Christopher Tate
2013-09-25 01:20:38 +00:00
committed by Android (Google) Code Review
parent 8488f9fa2e 6578ad17ca
commit 044fd573ce
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/AlarmManagerService.java
View File

@@ -1016,12 +1016,11 @@ class AlarmManagerService extends IAlarmManager.Stub {
private native int setKernelTimezone(int fd, int minuteswest); private native int setKernelTimezone(int fd, int minuteswest);
private void triggerAlarmsLocked(ArrayList<Alarm> triggerList, long nowELAPSED, long nowRTC) { private void triggerAlarmsLocked(ArrayList<Alarm> triggerList, long nowELAPSED, long nowRTC) {
Batch batch;
// batches are temporally sorted, so we need only pull from the // batches are temporally sorted, so we need only pull from the
// start of the list until we either empty it or hit a batch // start of the list until we either empty it or hit a batch
// that is not yet deliverable // that is not yet deliverable
while ((batch = mAlarmBatches.get(0)) != null) { while (mAlarmBatches.size() > 0) {
Batch batch = mAlarmBatches.get(0);
if (batch.start > nowELAPSED) { if (batch.start > nowELAPSED) {
// Everything else is scheduled for the future // Everything else is scheduled for the future
break; break;