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

Commit 64201f9d authored by Gavin Corkery's avatar Gavin Corkery
Browse files

Revert "Ensure that health check controller is unbound correctly" 

This reverts commit 553c94bc.

Reason for revert: Breaks NetworkStagedRollbackTest. Will re-submit change once I have a fix for that issue
Bug: 157662759
Change-Id: If81c01c597f37ff01924c8b038cbd38f77e7fa06
parent 553c94bc

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

+6 −1
Original line number Diff line number Diff line
@@ -177,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
@@ -252,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;
@@ -638,7 +642,7 @@ public class PackageWatchdog { 
        synchronized (mLock) {

            if (mIsPackagesReady) {

                Set<String> packages = getPackagesPendingHealthChecksLocked();

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

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

                    syncRequired = true;

                    mRequestedHealthCheckPackages = packages;

                }
@@ -650,6 +654,7 @@ public class PackageWatchdog { 
            Slog.i(TAG, "Syncing health check requests for packages: "

                    + mRequestedHealthCheckPackages);

            mHealthCheckController.syncRequests(mRequestedHealthCheckPackages);

            mSyncRequired = false;

        }

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,6 @@ 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),