Merge "Improve javadoc for Wi-Fi related policies" into tm-dev am: e51b62b2a3 am: 46c447841b

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

Change-Id: I1116841f8b67c8fc0859e02af4c21dae18c922bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 1a230206b0f1..d6566048f2c4 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