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

Commit dbc7520d authored by JW Wang's avatar JW Wang
Browse files

Remove unused code (6/n) 

Bug: 140472424
Test: atest PackageWatchdogTest
Change-Id: I9c42b20785c3002a4d73423a0cac26e3d45640eb
parent d23419c1

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

+0 −70
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.service.watchdog.ExplicitHealthCheckService.PackageConfig; 


import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.mockito.ArgumentMatchers.anyInt;
@@ -65,8 +64,6 @@ import java.util.Set; 
import java.util.concurrent.TimeUnit;

import java.util.function.Consumer;



// TODO: Write test without using PackageWatchdog#getPackages. Just rely on

// behavior of observers receiving crash notifications or not to determine if it's registered

// TODO: Use Truth in tests.

/**

 * Test PackageWatchdog.
@@ -215,73 +212,6 @@ public class PackageWatchdogTest { 
        assertEquals(1, observer2.mHealthCheckFailedPackages.size());

    }



    /**

     * Test registration, unregistration, package expiry and duration reduction

     */

    @Test

    public void testRegistration() throws Exception {

        PackageWatchdog watchdog = createWatchdog();

        TestObserver observer1 = new TestObserver(OBSERVER_NAME_1);

        TestObserver observer2 = new TestObserver(OBSERVER_NAME_2);

        TestObserver observer3 = new TestObserver(OBSERVER_NAME_3);



        // Start observing for observer1 which will be unregistered

        watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION);

        // Start observing for observer2 which will expire

        watchdog.startObservingHealth(observer2, Arrays.asList(APP_A, APP_B), SHORT_DURATION);

        // Start observing for observer3 which will have expiry duration reduced

        watchdog.startObservingHealth(observer3, Arrays.asList(APP_A), LONG_DURATION);



        // Verify packages observed at start

        // 1

        assertEquals(1, watchdog.getPackages(observer1).size());

        assertTrue(watchdog.getPackages(observer1).contains(APP_A));

        // 2

        assertEquals(2, watchdog.getPackages(observer2).size());

        assertTrue(watchdog.getPackages(observer2).contains(APP_A));

        assertTrue(watchdog.getPackages(observer2).contains(APP_B));

        // 3

        assertEquals(1, watchdog.getPackages(observer3).size());

        assertTrue(watchdog.getPackages(observer3).contains(APP_A));



        // Then unregister observer1

        watchdog.unregisterHealthObserver(observer1);



        // Verify observer2 and observer3 left

        // 1

        assertNull(watchdog.getPackages(observer1));

        // 2

        assertEquals(2, watchdog.getPackages(observer2).size());

        assertTrue(watchdog.getPackages(observer2).contains(APP_A));

        assertTrue(watchdog.getPackages(observer2).contains(APP_B));

        // 3

        assertEquals(1, watchdog.getPackages(observer3).size());

        assertTrue(watchdog.getPackages(observer3).contains(APP_A));



        // Then advance time a little and run messages in Handlers so observer2 expires

        moveTimeForwardAndDispatch(SHORT_DURATION);



        // Verify observer3 left with reduced expiry duration

        // 1

        assertNull(watchdog.getPackages(observer1));

        // 2

        assertNull(watchdog.getPackages(observer2));

        // 3

        assertEquals(1, watchdog.getPackages(observer3).size());

        assertTrue(watchdog.getPackages(observer3).contains(APP_A));



        // Then advance time some more and run messages in Handlers so observer3 expires

        moveTimeForwardAndDispatch(LONG_DURATION);



        // Verify observer3 expired

        // 1

        assertNull(watchdog.getPackages(observer1));

        // 2

        assertNull(watchdog.getPackages(observer2));

        // 3

        assertNull(watchdog.getPackages(observer3));

    }



    /** Observing already observed package extends the observation time. */

    @Test

    public void testObserveAlreadyObservedPackage() {