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

Commit b9e42c7a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18374443



Change-Id: I5dfdd878d3bead3a3fc6bf12c10a3705e89f3c1c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e08e9c3f e51b62b2

core/java/android/app/admin/DevicePolicyManager.java

+3 −1
Original line number Diff line number Diff line
@@ -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

























core/java/android/os/UserManager.java



+5
−1




























Original line number
Diff line number
Diff line








@@ -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