Skip to content

Commit

Permalink
No public description
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 616078108
  • Loading branch information
jscott1989 authored and pfmaggi committed Mar 20, 2024
1 parent af909d5 commit 62a9f6e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
import static android.os.UserManager.DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI;
import static android.os.UserManager.DISALLOW_SMS;
import static android.os.UserManager.DISALLOW_SYSTEM_ERROR_DIALOGS;
import static android.os.UserManager.DISALLOW_ULTRA_WIDEBAND_RADIO;
import static android.os.UserManager.DISALLOW_UNIFIED_PASSWORD;
import static android.os.UserManager.DISALLOW_UNINSTALL_APPS;
import static android.os.UserManager.DISALLOW_UNMUTE_MICROPHONE;
Expand Down Expand Up @@ -215,6 +216,7 @@ public UserRestriction(String key, int titleResId, String permission) {
new UserRestriction(DISALLOW_CONFIG_DEFAULT_APPS, R.string.disallow_config_default_apps),
new UserRestriction(
DISALLOW_CONFIG_LOCALE, R.string.disallow_config_locale, MANAGE_DEVICE_POLICY_LOCALE),
new UserRestriction(DISALLOW_ULTRA_WIDEBAND_RADIO, R.string.disallow_ultra_wideband_radio),
};

/**
Expand Down Expand Up @@ -250,6 +252,7 @@ public UserRestriction(String key, int titleResId, String permission) {
DISALLOW_ADD_WIFI_CONFIG,
DISALLOW_CELLULAR_2G,
DISALLOW_CONFIG_DEFAULT_APPS,
DISALLOW_ULTRA_WIDEBAND_RADIO,
};

/** Setting these user restrictions only have effect on primary users. */
Expand Down Expand Up @@ -278,6 +281,7 @@ public UserRestriction(String key, int titleResId, String permission) {
DISALLOW_USB_FILE_TRANSFER,
DISALLOW_AIRPLANE_MODE,
DISALLOW_CONFIG_PRIVATE_DNS,
DISALLOW_ULTRA_WIDEBAND_RADIO,
};

/** User restrictions that cannot be set by profile owners. Applied to all users. */
Expand Down Expand Up @@ -357,7 +361,7 @@ public UserRestriction(String key, int titleResId, String permission) {
};

public static String[] UDC_PLUS_RESTRICTIONS = {
DISALLOW_CELLULAR_2G, DISALLOW_CONFIG_DEFAULT_APPS,
DISALLOW_CELLULAR_2G, DISALLOW_CONFIG_DEFAULT_APPS, DISALLOW_ULTRA_WIDEBAND_RADIO,
};

public static UserRestriction getRestriction(String restrictionKey) {
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@
<string name="disallow_cellular_2g">Disallow Cellular 2G</string>
<string name="disallow_config_default_apps">Disallow config default apps</string>
<string name="disallow_config_locale">Disallow config locale</string>
<string name="disallow_ultra_wideband_radio">Disallow ultra wideband radio</string>
<string name="user_restriction_error_msg">Operation not allowed</string>

<!-- Strings for select app -->
Expand Down

0 comments on commit 62a9f6e

Please sign in to comment.