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

Commit 9da918c7 authored by Gavin Corkery's avatar Gavin Corkery
Browse files

Remove NPE in onPackageFailure 

It is possible for null to be returned by
ProcessRecord.getPackageListWithVersionCode on package failure. This
can cause a NPE in Package Watchdog. Ensure that the list of failing
packages is not null.

Test: atest PackageWatchdogTest
Bug: 151113966
Change-Id: Iab23cd6b4b8ae6b787df5f0b831b51e0ac8b3d31
parent e6dbe2b8

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

+4 −0
Original line number Diff line number Diff line
@@ -354,6 +354,10 @@ public class PackageWatchdog { 
     */

    public void onPackageFailure(List<VersionedPackage> packages,

            @FailureReasons int failureReason) {

        if (packages == null) {

            Slog.w(TAG, "Could not resolve a list of failing packages");

            return;

        }

        mLongTaskHandler.post(() -> {

            synchronized (mLock) {

                if (mAllObservers.isEmpty()) {

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

+14 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,20 @@ public class PackageWatchdogTest { 
        assertThat(bootObserver2.mitigatedBootLoop()).isFalse();

    }



    /**

     * Ensure that passing a null list of failed packages does not cause any mitigation logic to

     * execute.

     */

    @Test

    public void testNullFailedPackagesList() {

        PackageWatchdog watchdog = createWatchdog();

        TestObserver observer1 = new TestObserver(OBSERVER_NAME_1);

        watchdog.startObservingHealth(observer1, List.of(APP_A), LONG_DURATION);



        raiseFatalFailureAndDispatch(watchdog, null, PackageWatchdog.FAILURE_REASON_APP_CRASH);

        assertThat(observer1.mMitigatedPackages).isEmpty();

    }



    private void adoptShellPermissions(String... permissions) {

        InstrumentationRegistry

                .getInstrumentation()