commit b189ffb31817ec08bc7875a89e8e5eea7b1a589c
author Benedict Wong <benedictwong@google.com> Thu Jan 23 05:11:47 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 23 05:11:47 2020 +0000
tree 90cfce2d51a1184e54c34e43fae9bd50bafbcbd2
parent a9f0446ce8918beb386987ab2e6bc50c81044d1f
parent 50eec3d4084339af5ae37e3e4973b93b4baeb43c

Merge "Add IKEv2/IPsec VPN options"

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 68ad98c..9424807 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -912,6 +912,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 />
@@ -923,6 +926,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. -->