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

Commit 449b5853 authored by Gavin Corkery's avatar Gavin Corkery
Browse files

Sync requests only when there are changes to report 

Instead of periodically syncing requests with the same information,
only call into the ExplicitHealthCheckController when the set
of packages with pending health checks has changed, or a new observer
has been registered. Add tests to verify that duplicate calls are not made.

Test: atest PackageWatchdogTest#testSyncHealthCheckRequests
Test: atest NetworkStagedRollbackTest
Bug: 150114865
Bug: 146767850
Change-Id: I2926e9c7689e0ac9c4a142263ffd50a4747d016f
parent 6e4ef9b5

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

+18 −5
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ 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
@@ -174,6 +177,9 @@ public class PackageWatchdog { 
    // 0 if no prune is scheduled.

    @GuardedBy("mLock")

    private long mUptimeAtLastStateSync;

    // If true, sync explicit health check packages with the ExplicitHealthCheckController.

    @GuardedBy("mLock")

    private boolean mSyncRequired = false;



    @FunctionalInterface

    @VisibleForTesting
@@ -249,6 +255,7 @@ public class PackageWatchdog { 
     */

    public void registerHealthObserver(PackageHealthObserver observer) {

        synchronized (mLock) {

            mSyncRequired = true;

            ObserverInternal internalObserver = mAllObservers.get(observer.getName());

            if (internalObserver != null) {

                internalObserver.registeredObserver = observer;
@@ -628,17 +635,23 @@ public class PackageWatchdog { 
     * @see #syncRequestsAsync

     */

    private void syncRequests() {

        Set<String> packages = null;

        boolean syncRequired = false;

        synchronized (mLock) {

            if (mIsPackagesReady) {

                packages = getPackagesPendingHealthChecksLocked();

                Set<String> packages = getPackagesPendingHealthChecksLocked();

                if (!packages.equals(mRequestedHealthCheckPackages) || mSyncRequired) {

                    syncRequired = true;

                    mRequestedHealthCheckPackages = packages;

                }

            } // else, we will sync requests when packages become ready

        }



        // Call outside lock to avoid holding lock when calling into the controller.

        if (packages != null) {

            Slog.i(TAG, "Syncing health check requests for packages: " + packages);

            mHealthCheckController.syncRequests(packages);

        if (syncRequired) {

            Slog.i(TAG, "Syncing health check requests for packages: "

                    + mRequestedHealthCheckPackages);

            mHealthCheckController.syncRequests(mRequestedHealthCheckPackages);

            mSyncRequired = false;

        }

    }

tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java

+52 −0
Original line number Diff line number Diff line
@@ -1077,6 +1077,52 @@ public class PackageWatchdogTest { 
        assertThat(observer1.mMitigatedPackages).isEmpty();

    }



    /**

     * 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()
@@ -1233,6 +1279,7 @@ 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) {
@@ -1252,6 +1299,7 @@ public class PackageWatchdogTest { 


        @Override

        public void syncRequests(Set<String> packages) {

            mSyncRequests.add(packages);

            mRequestedPackages.clear();

            if (mIsEnabled) {

                packages.retainAll(mSupportedPackages);
@@ -1282,6 +1330,10 @@ public class PackageWatchdogTest { 
                return Collections.emptyList();

            }

        }



        public List<Set> getSyncRequests() {

            return mSyncRequests;

        }

    }



    private static class TestClock implements PackageWatchdog.SystemClock {