Merge "Always invoke callback" into oc-mr1-dev am: 71b304f6ff (c1b94282) · Commits · e / os / android_frameworks_base

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

+23 −21

Original line number	Diff line number	Diff line
		@@ -20243,10 +20243,8 @@ public class PackageManagerService extends IPackageManager.Stub
		true /* requireFullPermission /, false / checkShell */, "clear application data");

		final PackageSetting ps = mSettings.getPackageLPr(packageName);
		if (ps != null && filterAppAccessLPr(ps, callingUid, userId)) {
		return;
		}
		if (mProtectedPackages.isPackageDataProtected(userId, packageName)) {
		final boolean filterApp = (ps != null && filterAppAccessLPr(ps, callingUid, userId));
		if (!filterApp && mProtectedPackages.isPackageDataProtected(userId, packageName)) {
		throw new SecurityException("Cannot clear data for a protected package: "
		+ packageName);
		}
		@@ -20255,6 +20253,7 @@ public class PackageManagerService extends IPackageManager.Stub
		public void run() {
		mHandler.removeCallbacks(this);
		final boolean succeeded;
		if (!filterApp) {
		try (PackageFreezer freezer = freezePackage(packageName,
		"clearApplicationUserData")) {
		synchronized (mInstallLock) {
		@@ -20274,6 +20273,9 @@ public class PackageManagerService extends IPackageManager.Stub
		dsm.checkMemory();
		}
		}
		} else {
		succeeded = false;
		}
		if (observer != null) {
		try {
		observer.onRemoveCompleted(packageName, succeeded);