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

Commit c7df9123 authored by Stephanie Bak's avatar Stephanie Bak Committed by Android (Google) Code Review
Browse files

Merge "Adding a new user restriction DISALLOW_WIFI_TETHERING"

parents fd747ca6 32d0ee56

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32249,6 +32249,7 @@ package android.os { 
    field public static final String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone";

    field public static final String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";

    field public static final String DISALLOW_USER_SWITCH = "no_user_switch";

    field public static final String DISALLOW_WIFI_TETHERING = "no_wifi_tethering";

    field public static final String ENSURE_VERIFY_APPS = "ensure_verify_apps";

    field public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending";

    field public static final int QUIET_MODE_DISABLE_ONLY_IF_CREDENTIAL_NOT_REQUIRED = 1; // 0x1

core/java/android/os/UserManager.java

+18 −0
Original line number Diff line number Diff line
@@ -287,6 +287,24 @@ public class UserManager { 
     */

    public static final String DISALLOW_CHANGE_WIFI_STATE = "no_change_wifi_state";



    /**

     * Specifies if a user is disallowed from using Wi-Fi tethering.

     *

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

     * Wi-Fi tethering. Other forms of tethering are not affected.

     *

     * <p>The default value is <code>false</code>.

     *

     * <p>Key for user restrictions.

     * <p>Type: Boolean

     * @see DevicePolicyManager#addUserRestriction(ComponentName, String)

     * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)

     * @see #getUserRestrictions()

     */

    public static final String DISALLOW_WIFI_TETHERING = "no_wifi_tethering";



    /**

     * Specifies if a user is disallowed from changing the device

     * language. The default value is <code>false</code>.

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+6 −3
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_CONFIG_PRIVATE_DNS,

            UserManager.DISALLOW_MICROPHONE_TOGGLE,

            UserManager.DISALLOW_CAMERA_TOGGLE,

            UserManager.DISALLOW_CHANGE_WIFI_STATE

            UserManager.DISALLOW_CHANGE_WIFI_STATE,

            UserManager.DISALLOW_WIFI_TETHERING

    });



    public static final Set<String> DEPRECATED_USER_RESTRICTIONS = Sets.newArraySet(
@@ -186,7 +187,8 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_CONFIG_PRIVATE_DNS,

            UserManager.DISALLOW_MICROPHONE_TOGGLE,

            UserManager.DISALLOW_CAMERA_TOGGLE,

            UserManager.DISALLOW_CHANGE_WIFI_STATE

            UserManager.DISALLOW_CHANGE_WIFI_STATE,

            UserManager.DISALLOW_WIFI_TETHERING

    );



    /**
@@ -222,7 +224,8 @@ public class UserRestrictionsUtils { 
                    UserManager.DISALLOW_AIRPLANE_MODE,

                    UserManager.DISALLOW_CONFIG_DATE_TIME,

                    UserManager.DISALLOW_CONFIG_PRIVATE_DNS,

                    UserManager.DISALLOW_CHANGE_WIFI_STATE

                    UserManager.DISALLOW_CHANGE_WIFI_STATE,

                    UserManager.DISALLOW_WIFI_TETHERING

    );



    /**