Merge "Add missing check in getKeyguardDisabledFeature" into sc-v2-dev am: 2103430b56

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15950623 Change-Id: Icca4fdb910b9f5a25b5f3360c93e2c1ad52ebd6f
2021-12-22 17:04:53 +00:00
parent f4e3b530b9 2103430b56
commit ac2550317c
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
@@ -8270,6 +8270,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

        final CallerIdentity caller = getCallerIdentity();
        Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle));
+        Preconditions.checkCallAuthorization(
+                who == null || isCallingFromPackage(who.getPackageName(), caller.getUid())
+                        || isSystemUid(caller));

        final long ident = mInjector.binderClearCallingIdentity();
        try {