Merge "Sort user restriction constants and add the missing `DISALLOW_CONFIG_DEFAULT_APPS`." into main
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index d38354d..c6a9203 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -1989,85 +1989,86 @@
* @hide
*/
@StringDef(value = {
- DISALLOW_MODIFY_ACCOUNTS,
- DISALLOW_CONFIG_WIFI,
- DISALLOW_CONFIG_LOCALE,
- DISALLOW_INSTALL_APPS,
- DISALLOW_UNINSTALL_APPS,
- DISALLOW_SHARE_LOCATION,
+ ALLOW_PARENT_PROFILE_APP_LINKING,
+ DISALLOW_ADD_CLONE_PROFILE,
+ DISALLOW_ADD_MANAGED_PROFILE,
+ DISALLOW_ADD_PRIVATE_PROFILE,
+ DISALLOW_ADD_USER,
+ DISALLOW_ADD_WIFI_CONFIG,
+ DISALLOW_ADJUST_VOLUME,
DISALLOW_AIRPLANE_MODE,
- DISALLOW_CONFIG_BRIGHTNESS,
DISALLOW_AMBIENT_DISPLAY,
- DISALLOW_CONFIG_SCREEN_TIMEOUT,
- DISALLOW_INSTALL_UNKNOWN_SOURCES,
- DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
- DISALLOW_CONFIG_BLUETOOTH,
+ DISALLOW_APPS_CONTROL,
+ DISALLOW_ASSIST_CONTENT,
+ DISALLOW_AUTOFILL,
+ DISALLOW_BIOMETRIC,
DISALLOW_BLUETOOTH,
DISALLOW_BLUETOOTH_SHARING,
- DISALLOW_USB_FILE_TRANSFER,
- DISALLOW_CONFIG_CREDENTIALS,
- DISALLOW_REMOVE_USER,
- DISALLOW_REMOVE_MANAGED_PROFILE,
- DISALLOW_DEBUGGING_FEATURES,
- DISALLOW_CONFIG_VPN,
- DISALLOW_CONFIG_LOCATION,
- DISALLOW_CONFIG_DATE_TIME,
- DISALLOW_CONFIG_TETHERING,
- DISALLOW_NETWORK_RESET,
- DISALLOW_FACTORY_RESET,
- DISALLOW_ADD_USER,
- DISALLOW_ADD_MANAGED_PROFILE,
- DISALLOW_ADD_CLONE_PROFILE,
- DISALLOW_ADD_PRIVATE_PROFILE,
- ENSURE_VERIFY_APPS,
- DISALLOW_CONFIG_CELL_BROADCASTS,
- DISALLOW_CONFIG_MOBILE_NETWORKS,
- DISALLOW_APPS_CONTROL,
- DISALLOW_MOUNT_PHYSICAL_MEDIA,
- DISALLOW_UNMUTE_MICROPHONE,
- DISALLOW_ADJUST_VOLUME,
- DISALLOW_OUTGOING_CALLS,
- DISALLOW_SMS,
- DISALLOW_FUN,
- DISALLOW_CREATE_WINDOWS,
- DISALLOW_SYSTEM_ERROR_DIALOGS,
- DISALLOW_CROSS_PROFILE_COPY_PASTE,
- DISALLOW_OUTGOING_BEAM,
- DISALLOW_WALLPAPER,
- DISALLOW_SET_WALLPAPER,
- DISALLOW_SAFE_BOOT,
- DISALLOW_RECORD_AUDIO,
- DISALLOW_RUN_IN_BACKGROUND,
DISALLOW_CAMERA,
- DISALLOW_UNMUTE_DEVICE,
- DISALLOW_DATA_ROAMING,
- DISALLOW_SET_USER_ICON,
- DISALLOW_OEM_UNLOCK,
- DISALLOW_UNIFIED_PASSWORD,
- ALLOW_PARENT_PROFILE_APP_LINKING,
- DISALLOW_AUTOFILL,
+ DISALLOW_CAMERA_TOGGLE,
+ DISALLOW_CELLULAR_2G,
+ DISALLOW_CHANGE_WIFI_STATE,
+ DISALLOW_CONFIG_BLUETOOTH,
+ DISALLOW_CONFIG_BRIGHTNESS,
+ DISALLOW_CONFIG_CELL_BROADCASTS,
+ DISALLOW_CONFIG_CREDENTIALS,
+ DISALLOW_CONFIG_DATE_TIME,
+ DISALLOW_CONFIG_DEFAULT_APPS,
+ DISALLOW_CONFIG_LOCALE,
+ DISALLOW_CONFIG_LOCATION,
+ DISALLOW_CONFIG_MOBILE_NETWORKS,
+ DISALLOW_CONFIG_PRIVATE_DNS,
+ DISALLOW_CONFIG_SCREEN_TIMEOUT,
+ DISALLOW_CONFIG_TETHERING,
+ DISALLOW_CONFIG_VPN,
+ DISALLOW_CONFIG_WIFI,
DISALLOW_CONTENT_CAPTURE,
DISALLOW_CONTENT_SUGGESTIONS,
- DISALLOW_USER_SWITCH,
- DISALLOW_SHARE_INTO_MANAGED_PROFILE,
- DISALLOW_PRINTING,
- DISALLOW_CONFIG_PRIVATE_DNS,
- DISALLOW_MICROPHONE_TOGGLE,
- DISALLOW_CAMERA_TOGGLE,
- KEY_RESTRICTIONS_PENDING,
- DISALLOW_BIOMETRIC,
- DISALLOW_CHANGE_WIFI_STATE,
- DISALLOW_WIFI_TETHERING,
- DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI,
- DISALLOW_WIFI_DIRECT,
- DISALLOW_ADD_WIFI_CONFIG,
- DISALLOW_CELLULAR_2G,
- DISALLOW_ULTRA_WIDEBAND_RADIO,
+ DISALLOW_CREATE_WINDOWS,
+ DISALLOW_CROSS_PROFILE_COPY_PASTE,
+ DISALLOW_DATA_ROAMING,
+ DISALLOW_DEBUGGING_FEATURES,
+ DISALLOW_FACTORY_RESET,
+ DISALLOW_FUN,
DISALLOW_GRANT_ADMIN,
+ DISALLOW_INSTALL_APPS,
+ DISALLOW_INSTALL_UNKNOWN_SOURCES,
+ DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
+ DISALLOW_MICROPHONE_TOGGLE,
+ DISALLOW_MODIFY_ACCOUNTS,
+ DISALLOW_MOUNT_PHYSICAL_MEDIA,
DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO,
- DISALLOW_THREAD_NETWORK,
+ DISALLOW_NETWORK_RESET,
+ DISALLOW_OEM_UNLOCK,
+ DISALLOW_OUTGOING_BEAM,
+ DISALLOW_OUTGOING_CALLS,
+ DISALLOW_PRINTING,
+ DISALLOW_RECORD_AUDIO,
+ DISALLOW_REMOVE_MANAGED_PROFILE,
+ DISALLOW_REMOVE_USER,
+ DISALLOW_RUN_IN_BACKGROUND,
+ DISALLOW_SAFE_BOOT,
+ DISALLOW_SET_USER_ICON,
+ DISALLOW_SET_WALLPAPER,
+ DISALLOW_SHARE_INTO_MANAGED_PROFILE,
+ DISALLOW_SHARE_LOCATION,
+ DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI,
DISALLOW_SIM_GLOBALLY,
- DISALLOW_ASSIST_CONTENT,
+ DISALLOW_SMS,
+ DISALLOW_SYSTEM_ERROR_DIALOGS,
+ DISALLOW_THREAD_NETWORK,
+ DISALLOW_ULTRA_WIDEBAND_RADIO,
+ DISALLOW_UNIFIED_PASSWORD,
+ DISALLOW_UNINSTALL_APPS,
+ DISALLOW_UNMUTE_DEVICE,
+ DISALLOW_UNMUTE_MICROPHONE,
+ DISALLOW_USB_FILE_TRANSFER,
+ DISALLOW_USER_SWITCH,
+ DISALLOW_WALLPAPER,
+ DISALLOW_WIFI_DIRECT,
+ DISALLOW_WIFI_TETHERING,
+ ENSURE_VERIFY_APPS,
+ KEY_RESTRICTIONS_PENDING,
})
@Retention(RetentionPolicy.SOURCE)
public @interface UserRestrictionKey {}