Merge cherrypicks of ['googleplex-android-review.googlesource.com/29118523'] into 24Q4-release. (a68a5b08) · Commits · e / os / android_frameworks_base

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

+20 −7

Original line number	Diff line number	Diff line
		@@ -3389,18 +3389,31 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		return true;
		}
		// Does it contain a device admin for any user?
		int[] users;
		int[] allUsers = mUserManager.getUserIds();
		int[] targetUsers;
		if (userId == UserHandle.USER_ALL) {
		users = mUserManager.getUserIds();
		targetUsers = allUsers;
		} else {
		users = new int[]{userId};
		targetUsers = new int[]{userId};
		}
		for (int i = 0; i < users.length; ++i) {
		if (dpm.packageHasActiveAdmins(packageName, users[i])) {

		for (int i = 0; i < targetUsers.length; ++i) {
		if (dpm.packageHasActiveAdmins(packageName, targetUsers[i])) {
		return true;
		}
		if (isDeviceManagementRoleHolder(packageName, users[i])
		&& dpmi.isUserOrganizationManaged(users[i])) {
		}

		// If a package is DMRH on a managed user, it should also be treated as an admin on
		// that user. If that package is also a system package, it should also be protected
		// on other users otherwise "uninstall updates" on an unmanaged user may break
		// management on other users because apk version is shared between all users.
		var packageState = snapshotComputer().getPackageStateInternal(packageName);
		if (packageState == null) {
		return false;
		}
		for (int user : packageState.isSystem() ? allUsers : targetUsers) {
		if (isDeviceManagementRoleHolder(packageName, user)
		&& dpmi.isUserOrganizationManaged(user)) {
		return true;
		}
		}