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

Commit 98ed642e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix race condition on cancelling alarms" into rvc-dev am: c0ce3444 am: 3cdb1d15

Change-Id: I2b3d4567c008bea4e08ac20bdccd6b34acb26613
parents a999e71c 3cdb1d15
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();