Merge "Add missing check in getKeyguardDisabledFeature" into sc-v2-dev

2021-12-22 16:44:34 +00:00
parent 60aed7329d 4820ef1033
commit 2103430b56
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 {