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

Commit 779d2cff authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Rename apps User Restriction."

parents b576cec2 36fbc8d6

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -21577,7 +21577,7 @@ package android.os { 
    method public void setUserRestrictions(android.os.Bundle, android.os.UserHandle);

    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_CONFIG_APPS = "no_config_apps";

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

    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";

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

core/java/android/os/UserManager.java

+2 −2
Original line number Diff line number Diff line
@@ -226,14 +226,14 @@ public class UserManager { 
    public static final String DISALLOW_CONFIG_MOBILE_NETWORKS = "no_config_mobile_networks";



    /**

     * Key for user restrictions. Specifies if a user is disallowed from configuring

     * Key for user restrictions. Specifies if a user is disallowed from controlling

     * applications in Settings. The default value is <code>false</code>.

     * <p>

     * Type: Boolean

     * @see #setUserRestrictions(Bundle)

     * @see #getUserRestrictions()

     */

    public static final String DISALLOW_CONFIG_APPS = "no_config_apps";

    public static final String DISALLOW_APPS_CONTROL = "no_control_apps";



    /**

     * Key for user restrictions. Specifies if a user is disallowed from mounting

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

+2 −2
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ public class UserManagerService extends IUserManager.Stub { 
                writeBoolean(serializer, restrictions, UserManager.ENSURE_VERIFY_APPS);

                writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_CELL_BROADCASTS);

                writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);

                writeBoolean(serializer, restrictions, UserManager.DISALLOW_CONFIG_APPS);

                writeBoolean(serializer, restrictions, UserManager.DISALLOW_APPS_CONTROL);

                writeBoolean(serializer, restrictions, UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA);

                writeBoolean(serializer, restrictions, UserManager.DISALLOW_UNMUTE_MICROPHONE);

                writeBoolean(serializer, restrictions, UserManager.DISALLOW_ADJUST_VOLUME);
@@ -896,7 +896,7 @@ public class UserManagerService extends IUserManager.Stub { 
                        readBoolean(parser, restrictions, UserManager.ENSURE_VERIFY_APPS);

                        readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_CELL_BROADCASTS);

                        readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);

                        readBoolean(parser, restrictions, UserManager.DISALLOW_CONFIG_APPS);

                        readBoolean(parser, restrictions, UserManager.DISALLOW_APPS_CONTROL);

                        readBoolean(parser, restrictions,

                                UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA);

                        readBoolean(parser, restrictions, UserManager.DISALLOW_UNMUTE_MICROPHONE);