diff options
author | Christopher Tate <ctate@google.com> | 2013-09-26 21:10:38 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-26 21:10:39 +0000 |
commit | 4e9c7d8ba3caa8b558e2a1de796c100a562445ae (patch) | |
tree | b88e3e789deae8b61d254a8c9186c9e79d8559c5 /services/java | |
parent | c6afd813ac2ddaa576fc7866479e933627622248 (diff) | |
parent | ae269d5727d0b070b1bef7979eb1ce7a09525c32 (diff) | |
download | frameworks_base-4e9c7d8ba3caa8b558e2a1de796c100a562445ae.zip frameworks_base-4e9c7d8ba3caa8b558e2a1de796c100a562445ae.tar.gz frameworks_base-4e9c7d8ba3caa8b558e2a1de796c100a562445ae.tar.bz2 |
Merge "Sigh." into klp-dev
Diffstat (limited to 'services/java')
-rw-r--r-- | services/java/com/android/server/AlarmManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ class AlarmManagerService extends IAlarmManager.Stub { 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 @@ class AlarmManagerService extends IAlarmManager.Stub { 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 @@ class AlarmManagerService extends IAlarmManager.Stub { 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); |