diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-10-01 09:54:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-10-01 09:54:29 +0000 |
| commit | 0beddf145adad55fdfe94f56e8a8e1e821979f1d (patch) | |
| tree | d968059d977c8ffd668edb8138003538f63b5055 | |
| parent | 033b76e5091afa123ce140a174d6d59e22490804 (diff) | |
| parent | 251176e7748794928132121ac4f4390a55f34320 (diff) | |
Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index bd0d430c7291..990f1610fc73 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -3599,6 +3599,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { final CallerIdentity caller = getCallerIdentity(); Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle)); + Preconditions.checkCallAuthorization( + isCallingFromPackage(adminReceiver.getPackageName(), caller.getUid()) + || isSystemUid(caller)); synchronized (getLockObject()) { ActiveAdmin administrator = getActiveAdminUncheckedLocked(adminReceiver, userHandle); |