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

Commit bd227a14 authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "Fix profile deletion in package manager" into nyc-dev 

am: d65bdcad

* commit 'd65bdcad':
  Fix profile deletion in package manager

Change-Id: I71fde67734f7f9089a709c6daf202f23a5f4cf8b
parents f46e776b d65bdcad

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

+2 −3
Original line number Diff line number Diff line
@@ -7253,9 +7253,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
    private void deleteProfilesLI(PackageParser.Package pkg, boolean destroy) {

        try {

            if (destroy) {

                mInstaller.clearAppProfiles(pkg.packageName);

            } else {

                mInstaller.destroyAppProfiles(pkg.packageName);

            } else {

                mInstaller.clearAppProfiles(pkg.packageName);

            }

        } catch (InstallerException ex) {

            Log.e(TAG, "Could not delete profiles for package " + pkg.packageName);
@@ -14527,7 +14527,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
            if (DEBUG_REMOVE) Slog.d(TAG, "deletePackageX: pkg=" + packageName + " user=" + userId);

            res = deletePackageLI(packageName, removeForUser, true, allUsers,

                    flags | REMOVE_CHATTY, info, true, null);

            deleteProfilesLI(packageName, /*destroy*/ true);

            synchronized (mPackages) {

                if (res) {

                    mEphemeralApplicationRegistry.onPackageUninstalledLPw(uninstalledPs.pkg);