Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve javadoc for Wi-Fi related policies" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-16 22:04:37 +00:00
committed by Android (Google) Code Review
parent 79dc62bfef 1638b20f44
commit e51b62b2a3
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -11413,7 +11413,9 @@ public class DevicePolicyManager {
/** /**
* Called by a device owner or a profile owner of an organization-owned managed profile to * 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> * <p>
* WiFi network configuration lockdown is controlled by a global settings * WiFi network configuration lockdown is controlled by a global settings
* {@link android.provider.Settings.Global#WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN} and calling * {@link android.provider.Settings.Global#WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN} and calling

6
core/java/android/os/UserManager.java
View File

@@ -257,7 +257,8 @@ public class UserManager {
public static final String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts"; 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 * <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 * 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. * 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, * <p>This restriction can only be set by a device owner,
* a profile owner of an organization-owned managed profile on the parent profile. * 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 * When it is set by any of these owners, it prevents all users from using