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

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

Merge "Added a UserManager.DISALLOW_AUTOFILL restriction."

parents 54cacb7a 24d5893b

api/current.txt

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

    field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";

    field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";

    field public static final java.lang.String DISALLOW_AUTOFILL = "no_autofill";

    field public static final java.lang.String DISALLOW_BLUETOOTH = "no_bluetooth";

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

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

api/system-current.txt

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

    field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";

    field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";

    field public static final java.lang.String DISALLOW_AUTOFILL = "no_autofill";

    field public static final java.lang.String DISALLOW_BLUETOOTH = "no_bluetooth";

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

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

api/test-current.txt

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

    field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";

    field public static final java.lang.String DISALLOW_APPS_CONTROL = "no_control_apps";

    field public static final java.lang.String DISALLOW_AUTOFILL = "no_autofill";

    field public static final java.lang.String DISALLOW_BLUETOOTH = "no_bluetooth";

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

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

cmds/pm/src/com/android/commands/pm/Pm.java

+1 −0
Original line number Diff line number Diff line
@@ -1584,6 +1584,7 @@ public final class Pm { 
        System.err.println("       pm disable-user [--user USER_ID] PACKAGE_OR_COMPONENT");

        System.err.println("       pm disable-until-used [--user USER_ID] PACKAGE_OR_COMPONENT");

        System.err.println("       pm default-state [--user USER_ID] PACKAGE_OR_COMPONENT");

        System.err.println("       pm set-user-restriction [--user USER_ID] RESTRICTION VALUE");

        System.err.println("       pm hide [--user USER_ID] PACKAGE_OR_COMPONENT");

        System.err.println("       pm unhide [--user USER_ID] PACKAGE_OR_COMPONENT");

        System.err.println("       pm grant [--user USER_ID] PACKAGE PERMISSION");

core/java/android/os/UserManager.java

+14 −0
Original line number Diff line number Diff line
@@ -705,6 +705,20 @@ public class UserManager { 
    public static final String ALLOW_PARENT_PROFILE_APP_LINKING

            = "allow_parent_profile_app_linking";



    /**

     * Specifies if a user is not allowed to use Autofill Services.

     *

     * <p>Device owner and profile owner can set this restriction. When it is set by device owner,

     * only the target user will be affected.

     *

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

     *

     * @see DevicePolicyManager#addUserRestriction(ComponentName, String)

     * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)

     * @see #getUserRestrictions()

     */

    public static final String DISALLOW_AUTOFILL = "no_autofill";



    /**

     * Application restriction key that is used to indicate the pending arrival

     * of real restrictions for the app.