diff options
| author | Cassie Wang <cassiewang@google.com> | 2023-10-23 06:13:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-23 06:13:58 +0000 |
| commit | 16e99c187fcb71de9fe9eb5741c4e07632659993 (patch) | |
| tree | e8c03469a2f2215847f4dcab18a6af65eabb78b6 | |
| parent | ad49e33f014d212dfe3335a5fadc2f055462b668 (diff) | |
| parent | 5abd3420c41cbbd5882335f177f4236d708a9618 (diff) | |
| download | Settings-16e99c187fcb71de9fe9eb5741c4e07632659993.tar.gz | |
Merge "Add a config to show the Vpn options menu." into main am: 5abd3420c4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2685406
Change-Id: Ib8a236bd666204b48faac0189fbcc1acfcb3e8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | res/values/config.xml | 3 | ||||
| -rw-r--r-- | src/com/android/settings/vpn2/VpnSettings.java | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 17c33989502..d6f7c08b9c8 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -689,6 +689,9 @@ <!-- Whether to enable the advanced vpn feature. The default is not to. --> <bool name="config_advanced_vpn_enabled">false</bool> + <!-- Whether to show the VPN options menu. The default is to show it. --> + <bool name="config_show_vpn_options">true</bool> + <!-- An array of uid name for which packages exempt from Wi-Fi permission check. --> <string-array name="config_exempt_wifi_permission_uid_name" translatable="false"> <item>@string/config_settingsintelligence_package_name</item> diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 8cec2f42d96..0389ecdf423 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -141,6 +141,11 @@ public class VpnSettings extends RestrictedDashboardFragment implements @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); + + if (!getContext().getResources().getBoolean(R.bool.config_show_vpn_options)) { + return; + } + // Although FEATURE_IPSEC_TUNNELS should always be present in android S and beyond, // keep this check here just to be safe. if (!getContext().getPackageManager().hasSystemFeature( |