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

Commit 48bceac9 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix race condition on cancelling alarms" into rvc-dev am:...

Merge "Merge "Fix race condition on cancelling alarms" into rvc-dev am: c0ce3444 am: 3cdb1d15" into rvc-d1-dev-plus-aosp
parents 40d5e8a9 98ed642e
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -662,14 +662,19 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
            return;
        }

        // Cleann up from previous statsd - cancel any alarms that had been set. Do this here
        // instead of in binder death because statsd can come back and set different alarms, or not
        // want to set an alarm when it had been set. This guarantees that when we get a new statsd,
        // we cancel any alarms before it is able to set them.
        cancelAnomalyAlarm();
        cancelPullingAlarm();
        cancelAlarmForSubscriberTriggering();

        if (DEBUG) Log.d(TAG, "Saying hi to statsd");
        mStatsManagerService.statsdReady(statsd);
        try {
            statsd.statsCompanionReady();

            cancelAnomalyAlarm();
            cancelPullingAlarm();

            BroadcastReceiver appUpdateReceiver = new AppUpdateReceiver();
            BroadcastReceiver userUpdateReceiver = new UserUpdateReceiver();
            BroadcastReceiver shutdownEventReceiver = new ShutdownEventReceiver();