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

Commit b1e9df92 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add DISALLOW_CONFIG_BRIGHTNESS."

parents 98d1fabd c6ac29d3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32436,6 +32436,7 @@ package android.os { 
    field public static final java.lang.String DISALLOW_BLUETOOTH = "no_bluetooth";

    field public static final java.lang.String DISALLOW_BLUETOOTH_SHARING = "no_bluetooth_sharing";

    field public static final java.lang.String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";

    field public static final java.lang.String DISALLOW_CONFIG_BRIGHTNESS = "no_config_brightness";

    field public static final java.lang.String DISALLOW_CONFIG_CELL_BROADCASTS = "no_config_cell_broadcasts";

    field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";

    field public static final java.lang.String DISALLOW_CONFIG_DATE_TIME = "no_config_date_time";

core/java/android/os/UserManager.java

+15 −0
Original line number Diff line number Diff line
@@ -208,6 +208,21 @@ public class UserManager { 
     */

    public static final String DISALLOW_AIRPLANE_MODE = "no_airplane_mode";



    /**

     * Specifies if a user is disallowed from configuring brightness. When device owner sets it,

     * it'll only be applied on the target(system) user.

     *

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

     *

     * <p>This user restriction has no effect on managed profiles.

     * <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_CONFIG_BRIGHTNESS = "no_config_brightness";



    /**

     * Specifies if a user is disallowed from enabling the

     * "Unknown Sources" setting, that allows installation of apps from unknown sources.

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

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_USER_SWITCH,

            UserManager.DISALLOW_UNIFIED_PASSWORD,

            UserManager.DISALLOW_CONFIG_LOCATION_MODE,

            UserManager.DISALLOW_AIRPLANE_MODE

            UserManager.DISALLOW_AIRPLANE_MODE,

            UserManager.DISALLOW_CONFIG_BRIGHTNESS

    });



    /**