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

Commit 53976d13 authored by Roshan Pius's avatar Roshan Pius
Browse files

device_policy: Add NFC restriction to policy definition 

This was missed when adding the new NFC user restriction.

Flag: EXEMPT bugfix
Bug: 354021565
Change-Id: I2c11aefbc6b6eac09f9f005d6c61d9cc2f02a9e8
Test: TBD
parent 060e8c4b

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

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

        USER_RESTRICTION_PERMISSIONS.put(

                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(

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

        USER_RESTRICTION_PERMISSIONS.put(

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

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

        USER_RESTRICTION_FLAGS.put(

                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(

                UserManager.DISALLOW_SIM_GLOBALLY,

                POLICY_FLAG_GLOBAL_ONLY_POLICY);