Skip to content

Commit 96eca39

Browse files
author
Shuo Qian
committed
Add end-to-end test for 5g slicing APIs in DPM
Test: manual Bug: 183636789 Change-Id: I12fdba798af298a0cbbee21a542de3534412952a
1 parent 03fccee commit 96eca39

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
350350
private static final String LOCK_NOW_KEY = "lock_now";
351351
private static final String SET_ACCESSIBILITY_SERVICES_KEY = "set_accessibility_services";
352352
private static final String SET_ALWAYS_ON_VPN_KEY = "set_always_on_vpn";
353+
private static final String SET_GET_NETWORK_PREFERENCE_STATUS =
354+
"set_get_network_preference_status";
353355
private static final String SET_GLOBAL_HTTP_PROXY_KEY = "set_global_http_proxy";
354356
private static final String SET_LOCK_TASK_FEATURES_KEY = "set_lock_task_features";
355357
private static final String CLEAR_GLOBAL_HTTP_PROXY_KEY = "clear_global_http_proxy";
@@ -474,6 +476,7 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
474476
private SwitchPreference mDisableScreenCaptureSwitchPreference;
475477
private DpcSwitchPreference mDisableScreenCaptureOnParentSwitchPreference;
476478
private SwitchPreference mMuteAudioSwitchPreference;
479+
private SwitchPreference mEnterpriseNetworkPreferenceSwitchPreference;
477480

478481
private DpcPreference mDisableStatusBarPreference;
479482
private DpcPreference mReenableStatusBarPreference;
@@ -599,6 +602,13 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
599602
mMuteAudioSwitchPreference = (SwitchPreference) findPreference(
600603
MUTE_AUDIO_KEY);
601604
mMuteAudioSwitchPreference.setOnPreferenceChangeListener(this);
605+
606+
mEnterpriseNetworkPreferenceSwitchPreference = (SwitchPreference) findPreference(
607+
SET_GET_NETWORK_PREFERENCE_STATUS);
608+
mEnterpriseNetworkPreferenceSwitchPreference.setOnPreferenceChangeListener(this);
609+
mEnterpriseNetworkPreferenceSwitchPreference.setChecked(
610+
mDevicePolicyManager.isEnterpriseNetworkPreferenceEnabled());
611+
602612
findPreference(LOCK_SCREEN_POLICY_KEY).setOnPreferenceClickListener(this);
603613
findPreference(PASSWORD_CONSTRAINTS_KEY).setOnPreferenceClickListener(this);
604614
findPreference(RESET_PASSWORD_KEY).setOnPreferenceClickListener(this);
@@ -1538,6 +1548,11 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
15381548
(Boolean) newValue);
15391549
reloadMuteAudioUi();
15401550
return true;
1551+
case SET_GET_NETWORK_PREFERENCE_STATUS:
1552+
mDevicePolicyManager.setEnterpriseNetworkPreferenceEnabled((Boolean) newValue);
1553+
showToast(Boolean.toString(
1554+
mDevicePolicyManager.isEnterpriseNetworkPreferenceEnabled()));
1555+
return true;
15411556
case STAY_ON_WHILE_PLUGGED_IN:
15421557
mDevicePolicyManager.setGlobalSetting(mAdminComponentName,
15431558
Settings.Global.STAY_ON_WHILE_PLUGGED_IN,

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,7 @@
809809
<!-- Strings for networking -->
810810
<string name="networking_management_title">Networking</string>
811811
<string name="set_always_on_vpn">Set always-on VPN</string>
812+
<string name="set_get_network_preference_status">Network Preference Status</string>
812813
<string name="set_global_http_proxy">Set global HTTP proxy</string>
813814
<string name="clear_global_http_proxy">Clear global HTTP proxy</string>
814815
<string name="networking_proxy_host">Host</string>

app/src/main/res/xml/device_policy_header.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,12 @@
502502
android:key="set_always_on_vpn"
503503
android:title="@string/set_always_on_vpn"
504504
testdpc:minSdkVersion="N" />
505+
<com.afwsamples.testdpc.common.preference.DpcSwitchPreference
506+
android:key="set_get_network_preference_status"
507+
android:title="@string/set_get_network_preference_status"
508+
testdpc:admin="profileOwner"
509+
testdpc:minSdkVersion="S"
510+
testdpc:user="managedProfile" />
505511
<com.afwsamples.testdpc.common.preference.DpcPreference
506512
android:key="set_global_http_proxy"
507513
android:title="@string/set_global_http_proxy"

0 commit comments

Comments
 (0)