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 @@ false + + true + @string/config_settingsintelligence_package_name 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(