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

Commit ac7b17b9 authored by Gavin Corkery's avatar Gavin Corkery
Browse files

Unbind explicit health check controller when possible 

Ensure that calls to sync requests with the explicit health
check controller are always sent if the list of packages
pending health checks is empty, so that the controller can
unbind. This will allow extservices to be killed by lmkd
on low memory devices.

Test: atest PackageWatchdogTest
Test: atest NetworkStagedRollbackTest
Test: check logcat to see that the service is unbound
Bug: 156323728
Change-Id: If615a337760b2057b962284bde8565b593d82a50
parent 75bda788

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

+6 −3
Original line number Diff line number Diff line
@@ -239,7 +239,10 @@ public class PackageWatchdog { 
            mIsPackagesReady = true;

            mHealthCheckController.setCallbacks(packageName -> onHealthCheckPassed(packageName),

                    packages -> onSupportedPackages(packages),

                    () -> syncRequestsAsync());

                    () -> {

                            syncRequestsAsync();

                            mSyncRequired = true;

                    });

            setPropertyChangedListenerLocked();

            updateConfigs();

            registerConnectivityModuleHealthListener();
@@ -255,7 +258,6 @@ public class PackageWatchdog { 
     */

    public void registerHealthObserver(PackageHealthObserver observer) {

        synchronized (mLock) {

            mSyncRequired = true;

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

            if (internalObserver != null) {

                internalObserver.registeredObserver = observer;
@@ -642,7 +644,8 @@ public class PackageWatchdog { 
        synchronized (mLock) {

            if (mIsPackagesReady) {

                Set<String> packages = getPackagesPendingHealthChecksLocked();

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

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

                        || packages.isEmpty()) {

                    syncRequired = true;

                    mRequestedHealthCheckPackages = packages;

                }

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

+1 −0
Original line number Diff line number Diff line
@@ -1113,6 +1113,7 @@ public class PackageWatchdogTest { 
        mTestLooper.dispatchAll();



        List<Set> expectedSyncRequests = List.of(

                Set.of(),

                Set.of(APP_A),

                Set.of(APP_A, APP_B),

                Set.of(APP_A, APP_B, APP_C),