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

Commit e8ba34a8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev 

* changes:
  RESTRICT AUTOMERGE Fixes NPE when preparing app data during init
  RESTRICT AUTOMERGE Use KNOWN_PACKAGES when shared lib consumers
  RESTRICT AUTOMERGE Handles null outInfo in deleteSystemPackageLI
parents 3b8b2681 bf04ea6d

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

+27 −22
Original line number Diff line number Diff line
@@ -18610,7 +18610,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                            continue;

                        }

                        List<VersionedPackage> libClientPackages = getPackagesUsingSharedLibraryLPr(

                                libraryInfo, 0, currUserId);

                                libraryInfo, MATCH_KNOWN_PACKAGES, currUserId);

                        if (!ArrayUtils.isEmpty(libClientPackages)) {

                            Slog.w(TAG, "Not removing package " + pkg.manifestPackageName

                                    + " hosting lib " + libraryInfo.getName() + " version "
@@ -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());










@@ -22933,9 +22937,9 @@ public class PackageManagerService extends IPackageManager.Stub













            mSettings.writeKernelMappingLPr(ps);















        }



























        final UserManager um = mContext.getSystemService(UserManager.class);













        final UserManagerService um = sUserManager;















        UserManagerInternal umInternal = getUserManagerInternal();













        for (UserInfo user : um.getUsers()) {













        for (UserInfo user : um.getUsers(false /* excludeDying */)) {















            final int flags;















            if (umInternal.isUserUnlockingOrUnlocked(user.id)) {















                flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;










@@ -23618,8 +23622,9 @@ public class PackageManagerService extends IPackageManager.Stub













                continue;















            }















            final String packageName = ps.pkg.packageName;













            // Skip over if system app













            if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0) {













            // Skip over if system app or static shared library













            if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0













                    || !TextUtils.isEmpty(ps.pkg.staticSharedLibName)) {















                continue;















            }















            if (DEBUG_CLEAN_APKS) {