commit 07c28cceeaf5e2944c900a5de6971a8574ee4d6c
author JW Wang <wangchun@google.com> Fri Jan 29 21:43:44 2021 +0800
committer JW Wang <wangchun@google.com> Mon Feb 01 12:40:21 2021 +0800
tree 3a5e737bb021218d7713f3fff82843878faaec10
parent 9f91f8972d418570ee04db254d58471f0c1b42f3

Fix a race in the callback (7/n)

syncRequestsAsync() posts a runnable which might be executed before
setting mSyncRequired.

Bug: 178675924
Test: atest PackageWatchdogTest
Change-Id: I6880b9b9729a0d4641e67993c530a3560a2470e9

services/core/java/com/android/server/PackageWatchdog.java

diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java
index ef21a05..61cbe17 100644
--- a/services/core/java/com/android/server/PackageWatchdog.java
+++ b/services/core/java/com/android/server/PackageWatchdog.java
@@ -260,8 +260,8 @@
             mHealthCheckController.setCallbacks(packageName -> onHealthCheckPassed(packageName),
                     packages -> onSupportedPackages(packages),
                     () -> {
-                            syncRequestsAsync();
                             mSyncRequired = true;
+                            syncRequestsAsync();
                     });
             setPropertyChangedListenerLocked();
             updateConfigs();