Skip to content
Snippets Groups Projects
Commit 58b534f2 authored by Kangping Dong's avatar Kangping Dong
Browse files

[Thread] add DISALLOW_THREAD_NETWORK to policy sets

This commit add missing policy configurations for
DISALLOW_THREAD_NETWORK.

See background go/ae-v-thread-admin-control

Test: atest CtsDevicePolicyTestCases:android.devicepolicy.cts.ThreadNetworkTest
Bug: 319079428
Change-Id: I90ea527f5352d4ff11248acf8c985321620daa19
parent 02a31a6e
No related branches found
No related tags found
No related merge requests found
......@@ -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
);
/**
......
......@@ -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));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment