Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac255031 authored by Ayush Sharma's avatar Ayush Sharma Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15950623

Change-Id: Icca4fdb910b9f5a25b5f3360c93e2c1ad52ebd6f
parents f4e3b530 2103430b

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -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 {