Merge "Clear defaults of an application installed in multiple users." (98680e96) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -11928,7 +11928,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		if (DEBUG_REMOVE) Slog.d(TAG, "Still installed by other users");
		removeUser = user.getIdentifier();
		appId = ps.appId;
		mSettings.writePackageRestrictionsLPr(removeUser);
		scheduleWritePackageRestrictionsLocked(removeUser);
		} else {
		// We need to set it back to 'installed' so the uninstall
		// broadcasts will be sent correctly.
		@@ -11943,7 +11943,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		if (DEBUG_REMOVE) Slog.d(TAG, "Deleting system app");
		removeUser = user.getIdentifier();
		appId = ps.appId;
		mSettings.writePackageRestrictionsLPr(removeUser);
		scheduleWritePackageRestrictionsLocked(removeUser);
		}
		}
		}
		@@ -11960,6 +11960,11 @@ public class PackageManagerService extends IPackageManager.Stub {
		mInstaller.clearUserData(packageName, removeUser);
		removeKeystoreDataIfNeeded(removeUser, appId);
		schedulePackageCleaning(packageName, removeUser, false);
		synchronized (mPackages) {
		if (clearPackagePreferredActivitiesLPw(packageName, removeUser)) {
		scheduleWritePackageRestrictionsLocked(removeUser);
		}
		}
		return true;
		}