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

Commit b9455bd0 authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

Merge "Implement DISALLOW_ULTRA_WIDEBAND_RADIO AE user restriction" am: 9e56f60c am: cd1414c7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2596492



Change-Id: I1ed0792e0e090439ed13791b6be621f9c067d9ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9ec091c cd1414c7

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32383,6 +32383,7 @@ package android.os { 
    field public static final String DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI = "no_sharing_admin_configured_wifi";

    field public static final String DISALLOW_SMS = "no_sms";

    field public static final String DISALLOW_SYSTEM_ERROR_DIALOGS = "no_system_error_dialogs";

    field public static final String DISALLOW_ULTRA_WIDEBAND_RADIO = "no_ultra_wideband_radio";

    field public static final String DISALLOW_UNIFIED_PASSWORD = "no_unified_password";

    field public static final String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps";

    field public static final String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone";

core/java/android/os/UserManager.java

+25 −0
Original line number Diff line number Diff line
@@ -1502,6 +1502,30 @@ public class UserManager { 
     */

    public static final String DISALLOW_CELLULAR_2G = "no_cellular_2g";



    /**

     * This user restriction specifies if Ultra-wideband is disallowed on the device. If

     * Ultra-wideband is disallowed it cannot be turned on via Settings.

     *

     * <p>This restriction can only be set by a device owner or a profile owner of an

     * organization-owned managed profile on the parent profile.

     * In both cases, the restriction applies globally on the device and will turn off the

     * ultra-wideband radio if it's currently on and prevent the radio from being turned on in

     * the future.

     *

     * <p>

     * Ultra-wideband (UWB) is a radio technology that can use a very low energy level

     * for short-range, high-bandwidth communications over a large portion of the radio spectrum.

     *

     * <p>Default is <code>false</code>.

     *

     * <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_ULTRA_WIDEBAND_RADIO = "no_ultra_wideband_radio";



    /**

     * List of key values that can be passed into the various user restriction related methods

     * in {@link UserManager} & {@link DevicePolicyManager}.
@@ -1584,6 +1608,7 @@ public class UserManager { 
            DISALLOW_WIFI_DIRECT,

            DISALLOW_ADD_WIFI_CONFIG,

            DISALLOW_CELLULAR_2G,

            DISALLOW_ULTRA_WIDEBAND_RADIO,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface UserRestrictionKey {}

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

+6 −3
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI,

            UserManager.DISALLOW_WIFI_DIRECT,

            UserManager.DISALLOW_ADD_WIFI_CONFIG,

            UserManager.DISALLOW_CELLULAR_2G

            UserManager.DISALLOW_CELLULAR_2G,

            UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO

    });



    public static final Set<String> DEPRECATED_USER_RESTRICTIONS = Sets.newArraySet(
@@ -197,7 +198,8 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_WIFI_TETHERING,

            UserManager.DISALLOW_WIFI_DIRECT,

            UserManager.DISALLOW_ADD_WIFI_CONFIG,

            UserManager.DISALLOW_CELLULAR_2G

            UserManager.DISALLOW_CELLULAR_2G,

            UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO

    );



    /**
@@ -237,7 +239,8 @@ public class UserRestrictionsUtils { 
                    UserManager.DISALLOW_WIFI_TETHERING,

                    UserManager.DISALLOW_WIFI_DIRECT,

                    UserManager.DISALLOW_ADD_WIFI_CONFIG,

                    UserManager.DISALLOW_CELLULAR_2G

                    UserManager.DISALLOW_CELLULAR_2G,

                    UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO

    );



    /**