Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf145a am: 64b856c601

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838542 Change-Id: Ida3864ef74a50d637c559155c2edc47391267857
2021-10-01 10:09:34 +00:00
parent fb1757f212 64b856c601
commit 6e4f53e93a
1 changed files with 3 additions and 0 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3618,6 +3618,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);