Skip to content

Commit 3d2ad46

Browse files
jscott1989pfmaggi
authored andcommitted
No public description
PiperOrigin-RevId: 626965875
1 parent e0cdd3c commit 3d2ad46

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/main/java/com/afwsamples/testdpc/policy/UserRestriction.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static android.os.UserManager.DISALLOW_AIRPLANE_MODE;
2626
import static android.os.UserManager.DISALLOW_AMBIENT_DISPLAY;
2727
import static android.os.UserManager.DISALLOW_APPS_CONTROL;
28+
import static android.os.UserManager.DISALLOW_ASSIST_CONTENT;
2829
import static android.os.UserManager.DISALLOW_AUTOFILL;
2930
import static android.os.UserManager.DISALLOW_BLUETOOTH;
3031
import static android.os.UserManager.DISALLOW_BLUETOOTH_SHARING;
@@ -217,6 +218,7 @@ public UserRestriction(String key, int titleResId, String permission) {
217218
new UserRestriction(
218219
DISALLOW_CONFIG_LOCALE, R.string.disallow_config_locale, MANAGE_DEVICE_POLICY_LOCALE),
219220
new UserRestriction(DISALLOW_ULTRA_WIDEBAND_RADIO, R.string.disallow_ultra_wideband_radio),
221+
new UserRestriction(DISALLOW_ASSIST_CONTENT, R.string.disallow_assist_content),
220222
};
221223

222224
/**
@@ -358,16 +360,19 @@ public UserRestriction(String key, int titleResId, String permission) {
358360
};
359361

360362
public static String[] TM_PLUS_RESTRICTIONS = {
361-
DISALLOW_CHANGE_WIFI_STATE, DISALLOW_WIFI_TETHERING, DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI,
362-
DISALLOW_WIFI_DIRECT, DISALLOW_ADD_WIFI_CONFIG,
363+
DISALLOW_CHANGE_WIFI_STATE,
364+
DISALLOW_WIFI_TETHERING,
365+
DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI,
366+
DISALLOW_WIFI_DIRECT,
367+
DISALLOW_ADD_WIFI_CONFIG,
363368
};
364369

365370
public static String[] UDC_PLUS_RESTRICTIONS = {
366371
DISALLOW_CELLULAR_2G, DISALLOW_CONFIG_DEFAULT_APPS, DISALLOW_ULTRA_WIDEBAND_RADIO,
367372
};
368373

369374
public static String[] VIC_PLUS_PARENT_RESTRICTIONS = {
370-
DISALLOW_CONFIG_BRIGHTNESS, DISALLOW_CONFIG_SCREEN_TIMEOUT,
375+
DISALLOW_CONFIG_BRIGHTNESS, DISALLOW_CONFIG_SCREEN_TIMEOUT, DISALLOW_ASSIST_CONTENT
371376
};
372377

373378
public static UserRestriction getRestriction(String restrictionKey) {

src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@
532532
<string name="disallow_config_default_apps">Disallow config default appsstring>
533533
<string name="disallow_config_locale">Disallow config localestring>
534534
<string name="disallow_ultra_wideband_radio">Disallow ultra wideband radiostring>
535+
<string name="disallow_assist_content">Disallow assist contentstring>
535536
<string name="user_restriction_error_msg">Operation not allowedstring>
536537

537538

0 commit comments

Comments
 (0)