Merge "Fix profile deletion in package manager" into nyc-dev (d65bdcad) · Commits · e / os / android_frameworks_base

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -7247,9 +7247,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);
		@@ -14521,7 +14521,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);