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

Revert "Only sync requests when there are changes to report"

Browse Source 
This reverts commit 68713d9830.

Reason for revert: This breaks NetworkStagedRollbackTest. I know the cause, but reverting for now is the best option
Bug: 151212665
Change-Id: I00f0d3011b7ad2b65d452b3d74e508ffc4d1a857
This commit is contained in:
Gavin Corkery
2020-03-12 13:17:09 +00:00
parent 68713d9830
commit 56b46738d7
2 changed files with 5 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/PackageWatchdog.java
View File

@@ -161,9 +161,6 @@ public class PackageWatchdog {
private final Runnable mSaveToFile = this::saveToFile;
private final SystemClock mSystemClock;
private final BootThreshold mBootThreshold;
// The set of packages that have been synced with the ExplicitHealthCheckController
@GuardedBy("mLock")
private Set<String> mRequestedHealthCheckPackages = new ArraySet<>();
@GuardedBy("mLock")
private boolean mIsPackagesReady;
// Flag to control whether explicit health checks are supported or not
@@ -627,22 +624,17 @@ public class PackageWatchdog {
* @see #syncRequestsAsync
*/
private void syncRequests() {
boolean syncRequired = false;
Set<String> packages = null;
synchronized (mLock) {
if (mIsPackagesReady) {
Set<String> packages = getPackagesPendingHealthChecksLocked();
if (!packages.equals(mRequestedHealthCheckPackages)) {
syncRequired = true;
mRequestedHealthCheckPackages = packages;
}
packages = getPackagesPendingHealthChecksLocked();
} // else, we will sync requests when packages become ready
}
// Call outside lock to avoid holding lock when calling into the controller.
if (syncRequired) {
Slog.i(TAG, "Syncing health check requests for packages: "
+ mRequestedHealthCheckPackages);
mHealthCheckController.syncRequests(mRequestedHealthCheckPackages);
if (packages != null) {
Slog.i(TAG, "Syncing health check requests for packages: " + packages);
mHealthCheckController.syncRequests(packages);
}
}

52
tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
View File

@@ -1063,52 +1063,6 @@ public class PackageWatchdogTest {
assertThat(bootObserver2.mitigatedBootLoop()).isFalse();
}
/**
* Test to verify that Package Watchdog syncs health check requests with the controller
* correctly, and that the requests are only synced when the set of observed packages
* changes.
*/
@Test
public void testSyncHealthCheckRequests() {
TestController testController = spy(TestController.class);
testController.setSupportedPackages(List.of(APP_A, APP_B, APP_C));
PackageWatchdog watchdog = createWatchdog(testController, true);
TestObserver testObserver1 = new TestObserver(OBSERVER_NAME_1);
watchdog.registerHealthObserver(testObserver1);
watchdog.startObservingHealth(testObserver1, List.of(APP_A), LONG_DURATION);
mTestLooper.dispatchAll();
TestObserver testObserver2 = new TestObserver(OBSERVER_NAME_2);
watchdog.registerHealthObserver(testObserver2);
watchdog.startObservingHealth(testObserver2, List.of(APP_B), LONG_DURATION);
mTestLooper.dispatchAll();
TestObserver testObserver3 = new TestObserver(OBSERVER_NAME_3);
watchdog.registerHealthObserver(testObserver3);
watchdog.startObservingHealth(testObserver3, List.of(APP_C), LONG_DURATION);
mTestLooper.dispatchAll();
watchdog.unregisterHealthObserver(testObserver1);
mTestLooper.dispatchAll();
watchdog.unregisterHealthObserver(testObserver2);
mTestLooper.dispatchAll();
watchdog.unregisterHealthObserver(testObserver3);
mTestLooper.dispatchAll();
List<Set> expectedSyncRequests = List.of(
Set.of(APP_A),
Set.of(APP_A, APP_B),
Set.of(APP_A, APP_B, APP_C),
Set.of(APP_B, APP_C),
Set.of(APP_C),
Set.of()
);
assertThat(testController.getSyncRequests()).isEqualTo(expectedSyncRequests);
}
private void adoptShellPermissions(String... permissions) {
InstrumentationRegistry
.getInstrumentation()
@@ -1265,7 +1219,6 @@ public class PackageWatchdogTest {
private Consumer<String> mPassedConsumer;
private Consumer<List<PackageConfig>> mSupportedConsumer;
private Runnable mNotifySyncRunnable;
private List<Set> mSyncRequests = new ArrayList<>();
@Override
public void setEnabled(boolean enabled) {
@@ -1285,7 +1238,6 @@ public class PackageWatchdogTest {
@Override
public void syncRequests(Set<String> packages) {
mSyncRequests.add(packages);
mRequestedPackages.clear();
if (mIsEnabled) {
packages.retainAll(mSupportedPackages);
@@ -1316,10 +1268,6 @@ public class PackageWatchdogTest {
return Collections.emptyList();
}
}
public List<Set> getSyncRequests() {
return mSyncRequests;
}
}
private static class TestClock implements PackageWatchdog.SystemClock {