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

Commit caf310f2 authored by Jason Parks's avatar Jason Parks
Browse files

Add new user restriction for changing default apps. 

Test: manual
Bug: 254268464
Change-Id: I31190ff3cb9e832f934f4e4f34fe90fc3babf8fe
parent 2f078882

core/api/current.txt

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

    field public static final String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";

    field public static final String DISALLOW_CONFIG_DATE_TIME = "no_config_date_time";

    field public static final String DISALLOW_CONFIG_DEFAULT_APPS = "disallow_config_default_apps";

    field public static final String DISALLOW_CONFIG_LOCALE = "no_config_locale";

    field public static final String DISALLOW_CONFIG_LOCATION = "no_config_location";

    field public static final String DISALLOW_CONFIG_MOBILE_NETWORKS = "no_config_mobile_networks";

core/java/android/os/UserManager.java

+15 −0
Original line number Diff line number Diff line
@@ -1471,6 +1471,21 @@ public class UserManager { 
     */

    public static final String DISALLOW_BIOMETRIC = "disallow_biometric";



    /**

     * Specifies whether the user is allowed to modify default apps in settings.

     *

     * <p>This restriction can be set by device or profile owner.

     *

     * <p>The default value 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_CONFIG_DEFAULT_APPS = "disallow_config_default_apps";



    /**

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

     * of real restrictions for the app.

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

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_WIFI_DIRECT,

            UserManager.DISALLOW_ADD_WIFI_CONFIG,

            UserManager.DISALLOW_CELLULAR_2G,

            UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO

            UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO,

            UserManager.DISALLOW_CONFIG_DEFAULT_APPS

    });



    public static final Set<String> DEPRECATED_USER_RESTRICTIONS = Sets.newArraySet(