commit ae269d5727d0b070b1bef7979eb1ce7a09525c32
author Christopher Tate <ctate@google.com> Thu Sep 26 13:11:55 2013 -0700
committer Christopher Tate <ctate@google.com> Thu Sep 26 13:23:43 2013 -0700
tree ea9e98e54d21a4fd544c14ff659966fd2af70c4f
parent 91949b20c9e430eaba8cf2cf21abe403eb298a94

Sigh.

Bug 10746233

Change-Id: I18c84f2bd53a511fc86be42b5d72062650e5b289

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

diff --git a/services/java/com/android/server/AlarmManagerService.java b/services/java/com/android/server/AlarmManagerService.java
index 04d6332..3d804ef 100644
--- a/services/java/com/android/server/AlarmManagerService.java
+++ b/services/java/com/android/server/AlarmManagerService.java
@@ -187,7 +187,7 @@
             boolean didRemove = false;
             long newStart = 0;  // recalculate endpoints as we go
             long newEnd = Long.MAX_VALUE;
-            for (int i = 0; i < alarms.size(); i++) {
+            for (int i = 0; i < alarms.size(); ) {
                 Alarm alarm = alarms.get(i);
                 if (alarm.operation.equals(operation)) {
                     alarms.remove(i);
@@ -214,7 +214,7 @@
             boolean didRemove = false;
             long newStart = 0;  // recalculate endpoints as we go
             long newEnd = Long.MAX_VALUE;
-            for (int i = 0; i < alarms.size(); i++) {
+            for (int i = 0; i < alarms.size(); ) {
                 Alarm alarm = alarms.get(i);
                 if (alarm.operation.getTargetPackage().equals(packageName)) {
                     alarms.remove(i);
@@ -241,7 +241,7 @@
             boolean didRemove = false;
             long newStart = 0;  // recalculate endpoints as we go
             long newEnd = Long.MAX_VALUE;
-            for (int i = 0; i < alarms.size(); i++) {
+            for (int i = 0; i < alarms.size(); ) {
                 Alarm alarm = alarms.get(i);
                 if (UserHandle.getUserId(alarm.operation.getCreatorUid()) == userHandle) {
                     alarms.remove(i);