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

Commit 77092ed1 authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

Merge "Fix "alarms in flight?" reporting"

parents b9c9a4a0 e66bcb43

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -5142,7 +5142,7 @@ public class AlarmManagerService extends SystemService { 
                Slog.d(TAG, "mBroadcastRefCount -> " + mBroadcastRefCount);

            }

            if (mBroadcastRefCount == 0) {

                mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 0).sendToTarget();

                mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 0, 0).sendToTarget();

                mWakeLock.release();

                if (mInFlight.size() > 0) {

                    mLog.w("Finished all dispatches with " + mInFlight.size()
@@ -5314,7 +5314,7 @@ public class AlarmManagerService extends SystemService { 
            if (mBroadcastRefCount == 0) {

                setWakelockWorkSource(alarm.workSource, alarm.creatorUid, alarm.statsTag, true);

                mWakeLock.acquire();

                mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 1).sendToTarget();

                mHandler.obtainMessage(AlarmHandler.REPORT_ALARMS_ACTIVE, 1, 0).sendToTarget();

            }

            final InFlight inflight = new InFlight(AlarmManagerService.this, alarm, nowELAPSED);

            mInFlight.add(inflight);