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

Commit e422bc0c authored by Bryan Ferris's avatar Bryan Ferris Committed by Android (Google) Code Review
Browse files

Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev 

* changes:
  Fixes NPE when preparing app data during init
  Use KNOWN_PACKAGES when shared lib consumers
  Handles null outInfo in deleteSystemPackageLI
parents 0f41dc42 5d3fc339

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

+24 −20
Original line number Diff line number Diff line
@@ -18951,7 +18951,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                            continue;

                        }

                        List<VersionedPackage> libClientPackages = getPackagesUsingSharedLibraryLPr(

                                libEntry.info, 0, currUserId);

                                libEntry.info, MATCH_KNOWN_PACKAGES, currUserId);

                        if (!ArrayUtils.isEmpty(libClientPackages)) {

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

                                    + " hosting lib " + libEntry.info.getName() + " version "
@@ -19283,7 +19283,8 @@ public class PackageManagerService extends IPackageManager.Stub 
     * Tries to delete system package.

     */

    private boolean deleteSystemPackageLIF(PackageParser.Package deletedPkg,

            PackageSetting deletedPs, int[] allUserHandles, int flags, PackageRemovedInfo outInfo,

            PackageSetting deletedPs, int[] allUserHandles, int flags,

            @Nullable PackageRemovedInfo outInfo,

            boolean writeSettings) {

        if (deletedPs.parentPackageName != null) {

            Slog.w(TAG, "Attempt to delete child system package " + deletedPkg.packageName);
@@ -19291,7 +19292,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        }















        final boolean applyUserRestrictions













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













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















        final PackageSetting disabledPs;















        // Confirm if the system package has been updated















        // An updated system app can be deleted. This will also have to restore










@@ -19321,6 +19322,7 @@ public class PackageManagerService extends IPackageManager.Stub













            }















        }



























        if (outInfo != null) {















            // Delete the updated package















            outInfo.isRemovedPackageSystemUpdate = true;















            if (outInfo.removedChildPackages != null) {









@@ -19338,6 +19340,7 @@ public class PackageManagerService extends IPackageManager.Stub













                    }















                }















            }













        }





























        if (disabledPs.versionCode < deletedPs.versionCode) {















            // Delete data for downgrades










@@ -23433,9 +23436,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());













            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;










@@ -24062,8 +24065,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());













                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) {