diff options
| author | 2022-04-05 11:32:48 +0000 | |
|---|---|---|
| committer | 2022-04-05 11:32:48 +0000 | |
| commit | 282fc4176671cac52c80d77f027543293872edcb (patch) | |
| tree | 08bad88fd7d3de924eb75b6a9b884433384e41b0 | |
| parent | 281d15d1788dca60d0052e2908e5a7d00f0d9f05 (diff) | |
| parent | 5bf99eb2064ba6d51451e1429d22deabc299471a (diff) | |
Merge "Expand Javadoc for DISALLOW_WIFI_TETHERING" into tm-dev am: 73b3dc4fb4 am: 5bf99eb206
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17563878
Change-Id: Icf36365b7c636fa7da45ad5bead4b7ce706bfc59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/UserManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index c4cb3195e485..a64e63eacd56 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -300,6 +300,10 @@ public class UserManager { * When it is set by any of these owners, it prevents all users from using * Wi-Fi tethering. Other forms of tethering are not affected. * + * This user restriction disables only Wi-Fi tethering. + * Use {@link #DISALLOW_CONFIG_TETHERING} to limit all forms of tethering. + * When {@link #DISALLOW_CONFIG_TETHERING} is set, this user restriction becomes obsolete. + * * <p>The default value is <code>false</code>. * * <p>Key for user restrictions. @@ -735,7 +739,7 @@ public class UserManager { public static final String DISALLOW_CONFIG_DATE_TIME = "no_config_date_time"; /** - * Specifies if a user is disallowed from configuring Tethering and portable hotspots + * Specifies if a user is disallowed from using and configuring Tethering and portable hotspots * via Settings. * * <p>This restriction can only be set by a device owner, a profile owner on the primary |