diff --git a/res/values/config.xml b/res/values/config.xml index 334d4e574c58..2c683ea342ff 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -661,6 +661,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 a91bb6c7e66d..e9b6a4ed52d1 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -142,6 +142,11 @@ public void onActivityCreated(Bundle savedInstanceState) { @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(