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

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

Merge "device_policy: Add NFC restriction to policy definition" into main

parents 9d7da630 53976d13

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -13974,6 +13974,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

        }

        USER_RESTRICTION_PERMISSIONS.put(

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO, new String[]{MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION});

                UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO, new String[]{MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION});

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO, new String[]{MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION});

        USER_RESTRICTION_PERMISSIONS.put(

        USER_RESTRICTION_PERMISSIONS.put(

                UserManager.DISALLOW_UNIFIED_PASSWORD, new String[]{MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS});

                UserManager.DISALLOW_UNIFIED_PASSWORD, new String[]{MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS});

        USER_RESTRICTION_PERMISSIONS.put(

        USER_RESTRICTION_PERMISSIONS.put(

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -537,6 +537,9 @@ final class PolicyDefinition<V> { 
                UserManager.DISALLOW_CELLULAR_2G, POLICY_FLAG_GLOBAL_ONLY_POLICY);

                UserManager.DISALLOW_CELLULAR_2G, POLICY_FLAG_GLOBAL_ONLY_POLICY);

        USER_RESTRICTION_FLAGS.put(

        USER_RESTRICTION_FLAGS.put(

                UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO, POLICY_FLAG_GLOBAL_ONLY_POLICY);

                UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO, POLICY_FLAG_GLOBAL_ONLY_POLICY);

        USER_RESTRICTION_FLAGS.put(

                UserManager.DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO,

                POLICY_FLAG_GLOBAL_ONLY_POLICY);

        USER_RESTRICTION_FLAGS.put(

        USER_RESTRICTION_FLAGS.put(

                UserManager.DISALLOW_SIM_GLOBALLY,

                UserManager.DISALLOW_SIM_GLOBALLY,

                POLICY_FLAG_GLOBAL_ONLY_POLICY);

                POLICY_FLAG_GLOBAL_ONLY_POLICY);