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

Commit 6186b0b7 authored by Rafael Prado's avatar Rafael Prado Committed by Android (Google) Code Review
Browse files

Merge "Change cross user permission for MANAGE_DEVICE_POLICY_LOCK." into main

parents 02c7432e e8b31f40

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

+8 −2
Original line number Diff line number Diff line
@@ -23178,6 +23178,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL);

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_KEYGUARD,

                MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL);

        if (Flags.lockNowCoexistence()) {

            CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK,

                    MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL);

        }

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS,

                MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL);










@@ -23252,8 +23256,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);















        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCATION,















                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);













        if (!Flags.lockNowCoexistence()) {















            CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK,















                    MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);













        }















        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK_TASK,















                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);















        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MODIFY_USERS,