Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-19 17:37:32 +00:00
committed by Android (Google) Code Review
parent f6f2273cb0 eec8ee430c
commit c0ce3444eb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
View File

@@ -662,14 +662,19 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
return; 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"); if (DEBUG) Log.d(TAG, "Saying hi to statsd");
mStatsManagerService.statsdReady(statsd); mStatsManagerService.statsdReady(statsd);
try { try {
statsd.statsCompanionReady(); statsd.statsCompanionReady();
cancelAnomalyAlarm();
cancelPullingAlarm();
BroadcastReceiver appUpdateReceiver = new AppUpdateReceiver(); BroadcastReceiver appUpdateReceiver = new AppUpdateReceiver();
BroadcastReceiver userUpdateReceiver = new UserUpdateReceiver(); BroadcastReceiver userUpdateReceiver = new UserUpdateReceiver();
BroadcastReceiver shutdownEventReceiver = new ShutdownEventReceiver(); BroadcastReceiver shutdownEventReceiver = new ShutdownEventReceiver();