Merge "Don't allow userID changes on upgrade" into nyc-dev (42cf25f7) · Commits · e / os / android_frameworks_base

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -13648,6 +13648,16 @@ public class PackageManagerService extends IPackageManager.Stub {
		}
		}

		// Check for shared user id changes
		String invalidPackageName =
		getParentOrChildPackageChangedSharedUser(oldPackage, pkg);
		if (invalidPackageName != null) {
		res.setError(INSTALL_FAILED_SHARED_USER_INCOMPATIBLE,
		"Package " + invalidPackageName + " tried to change user "
		+ oldPackage.mSharedUserId);
		return;
		}

		// In case of rollback, remember per-user/profile install state
		allUsers = sUserManager.getUserIds();
		}
		@@ -13897,15 +13907,6 @@ public class PackageManagerService extends IPackageManager.Stub {
		setInstallAndUpdateTime(newPackage, deletedPkgSetting.firstInstallTime,
		System.currentTimeMillis());

		// Check for shared user id changes
		String invalidPackageName = getParentOrChildPackageChangedSharedUser(
		deletedPackage, newPackage);
		if (invalidPackageName != null) {
		res.setError(INSTALL_FAILED_SHARED_USER_INCOMPATIBLE,
		"Forbidding shared user change from " + deletedPkgSetting.sharedUser
		+ " to " + invalidPackageName);
		}

		// Update the package dynamic state if succeeded
		if (res.returnCode == PackageManager.INSTALL_SUCCEEDED) {
		// Now that the install succeeded make sure we remove data