summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
author Alex Johnston <acjohnston@google.com> 2020-08-27 11:41:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-08-27 11:41:12 +0000
commitc3248f2a4a42e423dd918e66151eff02bbdd3ade (patch)
tree99dbd893e5d045e69a9df8598115909632efa15f /services
parentac0b48684193234207cffbf16199b3ff542af38c (diff)
parent52818373e2807d757ca9934e666615b97cdebc47 (diff)
Merge "Remove wipeDataWithReason precondition check"
Diffstat (limited to 'services')
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java3
1 files changed, 0 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 c359b19f4b7f..80455833a3eb 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -5782,9 +5782,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
if (!mHasFeature) {
return;
}
- final CallerIdentity identity = getCallerIdentity();
- Preconditions.checkCallAuthorization(isSystemUid(identity) || isRootUid(identity)
- || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS_FULL));
final ActiveAdmin admin;
synchronized (getLockObject()) {