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

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

Merge "Add DISALLOW_CHANGE_NEAR_FIELD_COMMUNICATION_RADIO to global-only user... 

Merge "Add DISALLOW_CHANGE_NEAR_FIELD_COMMUNICATION_RADIO to global-only user restrictions." into main
parents 637a57d6 f44aa23a

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

+2 −0
Original line number Diff line number Diff line
@@ -556,6 +556,8 @@ final class PolicyDefinition<V> { 
                UserManager.DISALLOW_SIM_GLOBALLY,

                POLICY_FLAG_GLOBAL_ONLY_POLICY);

        USER_RESTRICTION_FLAGS.put(UserManager.DISALLOW_ASSIST_CONTENT, /* flags= */ 0);

        USER_RESTRICTION_FLAGS.put(UserManager.DISALLOW_CHANGE_NEAR_FIELD_COMMUNICATION_RADIO,

                POLICY_FLAG_GLOBAL_ONLY_POLICY);



        if (com.android.net.thread.platform.flags.Flags.threadUserRestrictionEnabled()) {

            USER_RESTRICTION_FLAGS.put(