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

Commit 282fc417 authored by Stephanie Bak's avatar Stephanie Bak Committed by Automerger Merge Worker
Browse files

Merge "Expand Javadoc for DISALLOW_WIFI_TETHERING" into tm-dev am: 73b3dc4f am: 5bf99eb2 

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



Change-Id: Icf36365b7c636fa7da45ad5bead4b7ce706bfc59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 281d15d1 5bf99eb2

core/java/android/os/UserManager.java

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