commit 2fcb8531abc8925b1bfbcbe74e8f8d884f494cbb
author Jeremy Goldman <goldmanj@google.com> Wed Apr 21 03:01:39 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 21 03:01:39 2021 +0000
tree 29b96416c2125d3ef8b92558210508bfbfc74ea0
parent e8063609eb1d3be3fc554962d7a85be1836acb7f
parent 5be88d11de395530a1de74c0d5fa64e23362afd6

Merge "Remove the "+" button on the help menu if no secure vpns can be created" into sc-dev

src/com/android/settings/vpn2/VpnSettings.java

diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 181b78f..cf0e4fa 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -59,6 +59,7 @@
 import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.Utils;
 import com.android.settings.widget.GearPreference;
 import com.android.settings.widget.GearPreference.OnGearClickListener;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -129,7 +130,17 @@
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.vpn, menu);
+        // Although FEATURE_IPSEC_TUNNELS should always be present in android S,
+        // keep this check here just to be safe.
+        if (Utils.isProviderModelEnabled(getContext())
+                && !getContext().getPackageManager().hasSystemFeature(
+                        PackageManager.FEATURE_IPSEC_TUNNELS)) {
+            Log.w(LOG_TAG, "FEATURE_IPSEC_TUNNELS missing from system, cannot create new VPNs");
+            return;
+        } else {
+            // By default, we should inflate this menu.
+            inflater.inflate(R.menu.vpn, menu);
+        }
     }
 
     @Override