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

Merge "Merge "Fix race condition on cancelling alarms" into rvc-dev am: c0ce3444eb am: 3cdb1d1525 am: b01e7e45cb" into rvc-qpr-dev-plus-aosp am: 8328633fd7

Browse Source 
Change-Id: I849dfac29fd852dcb550cc5f579ed7adf4c85b59
This commit is contained in:
Automerger Merge Worker
2020-05-19 18:23:32 +00:00
parent 26a0718c28 8328633fd7
commit 635efd3635
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;
}
// 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();