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

Commit 1bb2d3c6 authored by Patrick Baumann's avatar Patrick Baumann Committed by Sterling Huber
Browse files

RESTRICT AUTOMERGE 

Handles null outInfo in deleteSystemPackageLI

This change adds null checks before accessing outInfo in
deleteSystemPackageLI.

Bug: 142083996
Bug: 141413692
Test: manual; remove static dependency on eng build and reboot
Change-Id: If0fd48343e89cbb77ccd25826656194195d5b0cd
(cherry picked from commit 17471016)
Merged In: If0fd48343e89cbb77ccd25826656194195d5b0cd
parent 62fec618

services/core/java/com/android/server/pm/PackageManagerService.java

+21 −17
Original line number Diff line number Diff line
@@ -19023,10 +19023,11 @@ public class PackageManagerService extends IPackageManager.Stub 
     * Tries to delete system package.

     */

    private void deleteSystemPackageLIF(DeletePackageAction action, PackageSetting deletedPs,

            int[] allUserHandles, int flags, PackageRemovedInfo outInfo, boolean writeSettings)

            int[] allUserHandles, int flags, @Nullable PackageRemovedInfo outInfo,

            boolean writeSettings)

            throws SystemDeleteException {

        final boolean applyUserRestrictions

                = (allUserHandles != null) && (outInfo.origUsers != null);

        final boolean applyUserRestrictions =

                (allUserHandles != null) && outInfo != null && (outInfo.origUsers != null);

        final PackageParser.Package deletedPkg = deletedPs.pkg;

        // Confirm if the system package has been updated

        // An updated system app can be deleted. This will also have to restore
@@ -19047,6 +19048,7 @@ public class PackageManagerService extends IPackageManager.Stub 
            }

        }













        if (outInfo != null) {















            // Delete the updated package















            outInfo.isRemovedPackageSystemUpdate = true;















            if (outInfo.removedChildPackages != null) {









@@ -19064,6 +19066,7 @@ public class PackageManagerService extends IPackageManager.Stub













                    }















                }















            }













        }





























        if (disabledPs.versionCode < deletedPs.versionCode) {















            // Delete data for downgrades










@@ -19092,7 +19095,8 @@ public class PackageManagerService extends IPackageManager.Stub













        if (DEBUG_REMOVE) Slog.d(TAG, "Re-installing system package: " + disabledPs);















        try {















            installPackageFromSystemLIF(disabledPs.codePathString, allUserHandles,













                    outInfo.origUsers, deletedPs.getPermissionsState(), writeSettings);













                    outInfo == null ? null : outInfo.origUsers, deletedPs.getPermissionsState(),













                    writeSettings);















        } catch (PackageManagerException e) {















            Slog.w(TAG, "Failed to restore system package:" + deletedPkg.packageName + ": "















                    + e.getMessage());