Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4c4c9fb authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

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

* commit 'a63816c1':
  Sigh.
parents ea641208 a63816c1

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

+3 −3
Original line number Diff line number Diff line
@@ -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);