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

Merge "Expand Javadoc for DISALLOW_WIFI_TETHERING" into tm-dev am: 73b3dc4fb4 am: 5bf99eb206

Browse Source 
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>
This commit is contained in:
Stephanie Bak
2022-04-05 11:32:48 +00:00
committed by Automerger Merge Worker
parent 281d15d178 5bf99eb206
commit 282fc41766
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,6 +300,10 @@ public class UserManager {
* 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
* Wi-Fi tethering. Other forms of tethering are not affected. * 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>The default value is <code>false</code>.
* *
* <p>Key for user restrictions. * <p>Key for user restrictions.
@@ -735,7 +739,7 @@ public class UserManager {
public static final String DISALLOW_CONFIG_DATE_TIME = "no_config_date_time"; 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. * via Settings.
* *
* <p>This restriction can only be set by a device owner, a profile owner on the primary * <p>This restriction can only be set by a device owner, a profile owner on the primary