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

Commit bb4d6a20 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev

parents b72be59a 390989da

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -22311,9 +22311,10 @@ package android.os { 
    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";

    field public static final java.lang.String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media";

    field public static final java.lang.String DISALLOW_OUTGOING_CALLS = "no_outgoing_calls";

    field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";

    field public static final java.lang.String DISALLOW_SHARE_LOCATION = "no_share_location";

    field public static final java.lang.String DISALLOW_TELEPHONY = "no_telephony";

    field public static final java.lang.String DISALLOW_SMS = "no_sms";

    field public static final java.lang.String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps";

    field public static final java.lang.String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone";

    field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";

core/java/android/os/UserManager.java

+13 −2
Original line number Diff line number Diff line
@@ -270,16 +270,27 @@ public class UserManager { 
     */

    public static final String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";



    /**

     * Key for user restrictions. Specifies that the user is not allowed to make outgoing

     * phone calls. Emergency calls are still permitted.

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

     * <p/>

     * Type: Boolean

     * @see #setUserRestrictions(Bundle)

     * @see #getUserRestrictions()

     */

    public static final String DISALLOW_OUTGOING_CALLS = "no_outgoing_calls";



    /**

     * Key for user restrictions. Specifies that the user is not allowed to send or receive

     * phone calls or text messages. Emergency calls may still be permitted.

     * SMS messages.

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

     * <p/>

     * Type: Boolean

     * @see #setUserRestrictions(Bundle)

     * @see #getUserRestrictions()

     */

    public static final String DISALLOW_TELEPHONY = "no_telephony";

    public static final String DISALLOW_SMS = "no_sms";



    /**

     * Key for user restrictions. Specifies that windows besides app windows should not be

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

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

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_UNMUTE_MICROPHONE);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_ADJUST_VOLUME);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_TELEPHONY);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_OUTGOING_CALLS);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_SMS);

        writeBoolean(serializer, restrictions, UserManager.DISALLOW_CREATE_WINDOWS);

        serializer.endTag(null, TAG_RESTRICTIONS);

    }
@@ -986,7 +987,8 @@ public class UserManagerService extends IUserManager.Stub { 
                UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA);

        readBoolean(parser, restrictions, UserManager.DISALLOW_UNMUTE_MICROPHONE);

        readBoolean(parser, restrictions, UserManager.DISALLOW_ADJUST_VOLUME);

        readBoolean(parser, restrictions, UserManager.DISALLOW_TELEPHONY);

        readBoolean(parser, restrictions, UserManager.DISALLOW_OUTGOING_CALLS);

        readBoolean(parser, restrictions, UserManager.DISALLOW_SMS);

        readBoolean(parser, restrictions, UserManager.DISALLOW_CREATE_WINDOWS);

    }