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

Commit 95d73d54 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2767202, 2767203] into oc-mr1-release 

Change-Id: Ic6916534abc8b7f7f55664e59a8b887ae543f5e3
parents 54605ff0 dd67ffa6

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

+1 −1
Original line number Diff line number Diff line
@@ -2964,7 +2964,7 @@ class AlarmManagerService extends SystemService { 


        private InFlight removeLocked(PendingIntent pi, Intent intent) {

            for (int i = 0; i < mInFlight.size(); i++) {

                if (mInFlight.get(i).mPendingIntent.equals(pi)) {

                if (mInFlight.get(i).mPendingIntent == pi) {

                    return mInFlight.remove(i);

                }

            }