Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5be88d11 authored by Jeremy Goldman's avatar Jeremy Goldman
Browse files

Remove the "+" button on the help menu if no secure vpns can be created 

If the provider model is turned on, all new VPNs must have the secure
type. However, there is a system property which is necessary in order to
create secure VPNs. So if the FEATURE_IPSEC_TUNNELS is missing from the
device then we should not enable new 1st party VPNs.

Note, it has been confirmed with the VPN team that we don't expect any
devices released on S to actually be missing this property, but it's
still good to check just in case.

Bug: 176821216
Test: atest -c SettingsUnitTest
Change-Id: I712d342e1970243520612196ba57227b1ff05bbf
parent abc82d26

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

+12 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import com.android.internal.net.VpnConfig; 
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,8 +130,18 @@ public class VpnSettings extends RestrictedSettingsFragment implements 
    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        super.onCreateOptionsMenu(menu, inflater);

        // 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

    public void onPrepareOptionsMenu(Menu menu) {