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

Commit 48f07880 authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "bug140472424_remove_PackageWatchdog_getPackages" 

* changes:
  Remove unused code (6/n)
  Rewrite testObserveAlreadyObservedPackage (5/n)
  Rewrite PackageWatchdogTest#testPersistence (4/n)
  Rewrite PackageWatchdogTest#testRegistration (3/n)
  Collect packages when TestObserver#onHealthCheckFailed is called (2/n)
  Add a helper to reduce boilerplate code (1/n)
parents fd273bae dbc7520d

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

+0 −22
Original line number Diff line number Diff line
@@ -283,28 +283,6 @@ public class PackageWatchdog { 
        syncState("unregistering observer: " + observer.getName());

    }



    /**

     * Returns packages observed by {@code observer}

     *

     * @return an empty set if {@code observer} has some packages observerd from a previous boot

     * but has not registered itself in the current boot to receive notifications. Returns null

     * if there are no active packages monitored from any boot.

     */

    @Nullable

    public Set<String> getPackages(PackageHealthObserver observer) {

        synchronized (mLock) {

            for (int i = 0; i < mAllObservers.size(); i++) {

                if (observer.getName().equals(mAllObservers.keyAt(i))) {

                    if (observer.equals(mAllObservers.valueAt(i).mRegisteredObserver)) {

                        return mAllObservers.valueAt(i).mPackages.keySet();

                    }

                    return Collections.emptySet();

                }

            }

        }

        return null;

    }



    /**

     * Called when a process fails either due to a crash or ANR.

     *

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

+174 −164

File changed.

Preview size limit exceeded, changes collapsed.