PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I50104a17fd5b7d07cb50b9d6fcc002d7cfd96b6c
This commit is contained in:
Automerger Merge Worker
2020-01-24 07:59:53 +00:00
parent 64f11ee82a b9df8248fa
commit 336e7f1856
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/arrays.xml
View File

@@ -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. -->