Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new user restriction for changing default apps."

Browse Source
This commit is contained in:
Jason Parks
2023-01-11 20:15:37 +00:00
committed by Android (Google) Code Review
parent f479c62f7b caf310f26a
commit 7c99acd8f0
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

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

15
core/java/android/os/UserManager.java
View File

@@ -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.

3
services/core/java/com/android/server/pm/UserRestrictionsUtils.java
View File

@@ -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(