commit 336e7f1856fb0f3d8c914ae23a01d2b4f2ba0289
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 24 07:59:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 24 07:59:53 2020 +0000
tree 3ad2a906614cc7f66d39231392f3a3182f4072ea
parent 64f11ee82a0baba16f8602655d34370d9ffd9695
parent b9df8248fa5112d1015d805d2a775051b0b66364

Merge "Add IKEv2/IPsec VPN options" am: b189ffb318 am: 9d5397ab42 am: b9df8248fa

Change-Id: I50104a17fd5b7d07cb50b9d6fcc002d7cfd96b6c

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 396a485..9c3a622 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -957,6 +957,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 />
@@ -968,6 +971,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. -->