summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jonathan Scott <scottjonathan@google.com> 2023-03-02 15:42:25 +0000
committer Jonathan Scott <scottjonathan@google.com> 2023-03-02 15:42:25 +0000
commitca64ce622da326418009c9758f08f34e5d4ae03e (patch)
treef84403cba9c7833ab9dda2b83acf456c3b67ff4b
parent0683f76ebe7c9e73d37ef3adc07e9d105c79fb8a (diff)
Fix permission issue when provisioning.
Test: Launch "Set up TestDPC..." Change-Id: Ib018a8f5b060d8fd5526ebe0d0d521c3dab3adde
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java6
1 files 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 bfcb4c7b6bc0..721d85dc2153 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