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

Commit 11423418 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 10d045cd: am 716978e3: am 2cc03e56: Yet another user restriction. 

* commit '10d045cd':
  Yet another user restriction.
parents ec9da72a 10d045cd

api/current.txt

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

    field public static final java.lang.String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features";

    field public static final java.lang.String DISALLOW_FACTORY_RESET = "no_factory_reset";

    field public static final java.lang.String DISALLOW_FUN = "no_fun";

    field public static final java.lang.String DISALLOW_INSTALL_APPS = "no_install_apps";

    field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources";

    field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts";

api/system-current.txt

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

    field public static final java.lang.String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features";

    field public static final java.lang.String DISALLOW_FACTORY_RESET = "no_factory_reset";

    field public static final java.lang.String DISALLOW_FUN = "no_fun";

    field public static final java.lang.String DISALLOW_INSTALL_APPS = "no_install_apps";

    field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources";

    field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts";

core/java/android/os/UserManager.java

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

    public static final String DISALLOW_SMS = "no_sms";



    /**

     * Specifies if the user is not allowed to have fun. In some cases, the

     * device owner may wish to prevent the user from experiencing amusement or

     * joy while using the device. The default value is <code>false</code>.

     *

     * <p/>Key for user restrictions.

     * <p/>Type: Boolean

     * @see #setUserRestrictions(Bundle)

     * @see #getUserRestrictions()

     */

    public static final String DISALLOW_FUN = "no_fun";



    /**

     * Specifies that windows besides app windows should not be

     * created. This will block the creation of the following types of windows.

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

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

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_OUTGOING_CALLS);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_SMS);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_FUN);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_CREATE_WINDOWS);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_CROSS_PROFILE_COPY_PASTE);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_OUTGOING_BEAM);
@@ -1097,6 +1098,7 @@ public class UserManagerService extends IUserManager.Stub { 
        readBoolean(parser, restrictions, UserManager.DISALLOW_ADJUST_VOLUME);

        readBoolean(parser, restrictions, UserManager.DISALLOW_OUTGOING_CALLS);

        readBoolean(parser, restrictions, UserManager.DISALLOW_SMS);

        readBoolean(parser, restrictions, UserManager.DISALLOW_FUN);

        readBoolean(parser, restrictions, UserManager.DISALLOW_CREATE_WINDOWS);

        readBoolean(parser, restrictions, UserManager.DISALLOW_CROSS_PROFILE_COPY_PASTE);

        readBoolean(parser, restrictions, UserManager.DISALLOW_OUTGOING_BEAM);

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_UNMUTE_MICROPHONE);

        DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_ADJUST_VOLUME);

        DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_SMS);

        DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_FUN);

        DEVICE_OWNER_USER_RESTRICTIONS.add(UserManager.DISALLOW_SAFE_BOOT);

    }