Merge "[Thread] add DISALLOW_THREAD_NETWORK to policy sets" into main (b38b9f70) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -155,7 +155,8 @@ public class UserRestrictionsUtils {
		UserManager.DISALLOW_CONFIG_DEFAULT_APPS,
		UserManager.DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO,
		UserManager.DISALLOW_SIM_GLOBALLY,
		UserManager.DISALLOW_ASSIST_CONTENT
		UserManager.DISALLOW_ASSIST_CONTENT,
		UserManager.DISALLOW_THREAD_NETWORK
		});

		public static final Set<String> DEPRECATED_USER_RESTRICTIONS = Sets.newArraySet(
		@@ -206,7 +207,8 @@ public class UserRestrictionsUtils {
		UserManager.DISALLOW_ADD_WIFI_CONFIG,
		UserManager.DISALLOW_CELLULAR_2G,
		UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO,
		UserManager.DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO
		UserManager.DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO,
		UserManager.DISALLOW_THREAD_NETWORK
		);

		/**
		@@ -252,7 +254,8 @@ public class UserRestrictionsUtils {
		UserManager.DISALLOW_ADD_WIFI_CONFIG,
		UserManager.DISALLOW_CELLULAR_2G,
		UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO,
		UserManager.DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO
		UserManager.DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO,
		UserManager.DISALLOW_THREAD_NETWORK
		);

		/**

+4 −0

Original line number	Diff line number	Diff line
		@@ -506,6 +506,10 @@ final class PolicyDefinition<V> {
		UserManager.DISALLOW_SIM_GLOBALLY,
		POLICY_FLAG_GLOBAL_ONLY_POLICY);
		USER_RESTRICTION_FLAGS.put(UserManager.DISALLOW_ASSIST_CONTENT, /* flags= */ 0);
		if (com.android.net.thread.platform.flags.Flags.threadUserRestrictionEnabled()) {
		USER_RESTRICTION_FLAGS.put(
		UserManager.DISALLOW_THREAD_NETWORK, POLICY_FLAG_GLOBAL_ONLY_POLICY);
		}

		for (String key : USER_RESTRICTION_FLAGS.keySet()) {
		createAndAddUserRestrictionPolicyDefinition(key, USER_RESTRICTION_FLAGS.get(key));