diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 8647b9a2967c..93f91e5af3eb 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -11413,7 +11413,9 @@ public class DevicePolicyManager { /** * Called by a device owner or a profile owner of an organization-owned managed profile to - * control whether the user can change networks configured by the admin. + * control whether the user can change networks configured by the admin. When this lockdown is + * enabled, the user can still configure and connect to other Wi-Fi networks, or use other Wi-Fi + * capabilities such as tethering. * <p> * WiFi network configuration lockdown is controlled by a global settings * {@link android.provider.Settings.Global#WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN} and calling diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 196f2f94120e..0ffdfc6cbcb1 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -257,7 +257,8 @@ public class UserManager { public static final String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts"; /** - * Specifies if a user is disallowed from changing Wi-Fi access points via Settings. + * Specifies if a user is disallowed from changing Wi-Fi access points via Settings. This + * restriction does not affect Wi-Fi tethering settings. * * <p>A device owner and a profile owner can set this restriction, although the restriction has * no effect in a managed profile. When it is set by a device owner, a profile owner on the @@ -295,6 +296,9 @@ public class UserManager { /** * Specifies if a user is disallowed from using Wi-Fi tethering. * + * <p>This restriction does not limit the user's ability to modify or connect to regular + * Wi-Fi networks, which is separately controlled by {@link #DISALLOW_CONFIG_WIFI}. + * * <p>This restriction can only be set by a device owner, * a profile owner of an organization-owned managed profile on the parent profile. * When it is set by any of these owners, it prevents all users from using |