From ca64ce622da326418009c9758f08f34e5d4ae03e Mon Sep 17 00:00:00 2001 From: Jonathan Scott Date: Thu, 2 Mar 2023 15:42:25 +0000 Subject: [PATCH] Fix permission issue when provisioning. Test: Launch "Set up TestDPC..." Change-Id: Ib018a8f5b060d8fd5526ebe0d0d521c3dab3adde --- .../server/devicepolicy/DevicePolicyManagerService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index bfcb4c7b6bc0f..721d85dc21536 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -16405,12 +16405,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { mInjector.getPackageManager().getPackagesForUid(caller.getUid())); Preconditions.checkArgument(callerUidPackageNames.contains(packageName), "Caller uid doesn't match the one for the provided package."); + + return checkProvisioningPreconditionSkipPermission(action, packageName, caller.getUserId()) + == STATUS_OK; } finally { mInjector.binderRestoreCallingIdentity(ident); } - - return checkProvisioningPreconditionSkipPermission(action, packageName, caller.getUserId()) - == STATUS_OK; } @Override