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

Commit 9a7d247b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Exempt DMRH from permission check to keep existing behavior" into main

parents 2583ac54 c3959973

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

+3 −1
Original line number Diff line number Diff line
@@ -13385,7 +13385,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        int affectedUserId = parent

                ? getProfileParentId(caller.getUserId()) : caller.getUserId();













        if (!isCallerDevicePolicyManagementRoleHolder(caller)) {















            enforcePermission(MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, caller.getPackageName());













        }















        EnforcingAdmin enforcingAdmin =  getEnforcingAdminForCaller(who, caller.getPackageName());





























        Bundle bundle = mDevicePolicyEngine.getLocalPolicySetByAdmin(