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

am 4e9c7d8b: Merge "Sigh." into klp-dev

Browse Source 
* commit '4e9c7d8ba3caa8b558e2a1de796c100a562445ae':
  Sigh.
This commit is contained in:
Christopher Tate
2013-09-26 14:14:54 -07:00
committed by Android Git Automerger
parent ef7242326a 4e9c7d8ba3
commit a63816c1bb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,7 +187,7 @@ class AlarmManagerService extends IAlarmManager.Stub {
boolean didRemove = false; boolean didRemove = false;
long newStart = 0; // recalculate endpoints as we go long newStart = 0; // recalculate endpoints as we go
long newEnd = Long.MAX_VALUE; 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); Alarm alarm = alarms.get(i);
if (alarm.operation.equals(operation)) { if (alarm.operation.equals(operation)) {
alarms.remove(i); alarms.remove(i);
@@ -214,7 +214,7 @@ class AlarmManagerService extends IAlarmManager.Stub {
boolean didRemove = false; boolean didRemove = false;
long newStart = 0; // recalculate endpoints as we go long newStart = 0; // recalculate endpoints as we go
long newEnd = Long.MAX_VALUE; 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); Alarm alarm = alarms.get(i);
if (alarm.operation.getTargetPackage().equals(packageName)) { if (alarm.operation.getTargetPackage().equals(packageName)) {
alarms.remove(i); alarms.remove(i);
@@ -241,7 +241,7 @@ class AlarmManagerService extends IAlarmManager.Stub {
boolean didRemove = false; boolean didRemove = false;
long newStart = 0; // recalculate endpoints as we go long newStart = 0; // recalculate endpoints as we go
long newEnd = Long.MAX_VALUE; 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); Alarm alarm = alarms.get(i);
if (UserHandle.getUserId(alarm.operation.getCreatorUid()) == userHandle) { if (UserHandle.getUserId(alarm.operation.getCreatorUid()) == userHandle) {
alarms.remove(i); alarms.remove(i);