From 52cf82d495f0be382bd4b1030748de87d4d04067 Mon Sep 17 00:00:00 2001 From: Stephanie Bak Date: Mon, 4 Apr 2022 04:18:44 +0000 Subject: [PATCH] Expand Javadoc for DISALLOW_WIFI_TETHERING Bug: 226126768 Test: atest UserManagerTest Change-Id: I1a1e166b4238ff20f30dfd7a2664d9a33dbe020c --- core/java/android/os/UserManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index a715c6961359a..397a0ff5b0981 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. + * *

The default value is false. * *

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. * *

This restriction can only be set by a device owner, a profile owner on the primary