Merge "Clear calling identity when accessing isProfileOwner and listAllOwners" into sc-dev (0c2d1458) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+15 −12

Original line number	Diff line number	Diff line
		@@ -1207,7 +1207,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		List<OwnerDto> listAllOwners() {
		Preconditions.checkCallAuthorization(
		hasCallingOrSelfPermission(permission.MANAGE_DEVICE_ADMINS));

		return mInjector.binderWithCleanCallingIdentity(() -> {
		List<OwnerDto> owners = mOwners.listAllOwners();
		synchronized (getLockObject()) {
		for (int i = 0; i < owners.size(); i++) {
		@@ -1215,8 +1215,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		owner.isAffiliated = isUserAffiliatedWithDeviceLocked(owner.userId);
		}
		}

		return owners;
		});
		}

		/**
		@@ -8342,7 +8342,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}

		public boolean isProfileOwner(ComponentName who, int userId) {
		final ComponentName profileOwner = getProfileOwnerAsUser(userId);
		final ComponentName profileOwner = mInjector.binderWithCleanCallingIdentity(() ->
		getProfileOwnerAsUser(userId));
		return who != null && who.equals(profileOwner);
		}

		@@ -8359,7 +8360,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		*/
		public boolean isProfileOwner(CallerIdentity caller) {
		synchronized (getLockObject()) {
		final ComponentName profileOwner = getProfileOwnerAsUser(caller.getUserId());
		final ComponentName profileOwner = mInjector.binderWithCleanCallingIdentity(() ->
		getProfileOwnerAsUser(caller.getUserId()));
		// No profile owner.
		if (profileOwner == null) {
		return false;
		@@ -8982,7 +8984,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		Preconditions.checkArgumentNonnegative(userId, "Invalid userId");

		CallerIdentity caller = getCallerIdentity();
		Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId));
		Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId)
		\|\| hasFullCrossUsersPermission(caller, userId));

		synchronized (getLockObject()) {
		return mOwners.getProfileOwnerComponent(userId);