commit 9d5397ab42ff8a60efcf8b2ab16493d1eb2db126
author Benedict Wong <benedictwong@google.com> Wed Jan 22 22:09:59 2020 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 22 22:09:59 2020 -0800
tree 5ff7cde487b36db0f0fc47da039732a06b1bb802
parent e89b34a366f37e49ba7d920f512911e18faf8c0a
parent b189ffb31817ec08bc7875a89e8e5eea7b1a589c

Merge "Add IKEv2/IPsec VPN options"
am: b189ffb318

Change-Id: I865a04f4453fc0304ddc3daf9be47ebf2e8a1c3c

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b9a1939..8b13249 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -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. -->