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

Commit 9d5397ab authored by Benedict Wong's avatar Benedict Wong Committed by android-build-merger
Browse files

Merge "Add IKEv2/IPsec VPN options" 

am: b189ffb3

Change-Id: I865a04f4453fc0304ddc3daf9be47ebf2e8a1c3c
parents e89b34a3 b189ffb3

res/values/arrays.xml

+6 −0
Original line number Diff line number Diff line
@@ -920,6 +920,9 @@ 
        <item>IPSec Xauth PSK</item>

        <item>IPSec Xauth RSA</item>

        <item>IPSec Hybrid RSA</item>

        <item>IKEv2/IPSec MSCHAPv2</item>

        <item>IKEv2/IPSec PSK</item>

        <item>IKEv2/IPSec RSA</item>

    </string-array>



    <!-- Match this with the constants in VpnProfile. --> <skip />
@@ -931,6 +934,9 @@ 
        <item>IPSec VPN with pre-shared keys and Xauth authentication</item>

        <item>IPSec VPN with certificates and Xauth authentication</item>

        <item>IPSec VPN with certificates and hybrid authentication</item>

        <item>IKEv2/IPSec VPN with certificates and username/password authentication</item>

        <item>IKEv2/IPSec VPN with pre-shared keys</item>

        <item>IKEv2/IPSec VPN with certificates</item>

    </string-array>



    <!-- VPN proxy settings. -->