Merge "Add missing check in getKeyguardDisabledFeature"

2021-09-15 11:58:04 +00:00
parent dc93dc26f6 826f893513
commit e5ce6c6924
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
@@ -8243,6 +8243,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 {