Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS"

This commit is contained in:
Arc Wang
2019-11-21 05:54:12 +00:00
committed by Android (Google) Code Review
4 changed files with 77 additions and 32 deletions

View File

@@ -388,14 +388,12 @@
<!-- Phase 2 options for PEAP -->
<string-array name="wifi_peap_phase2_entries">
<item>None</item>
<item>MSCHAPV2</item>
<item>GTC</item>
</string-array>
<!-- Type of EAP method when EAP SIM, AKA, AKA' are supported -->
<string-array name="wifi_peap_phase2_entries_with_sim_auth">
<item>None</item>
<item translatable="false">MSCHAPV2</item>
<item translatable="false">GTC</item>
<item translatable="false">SIM</item>
@@ -403,9 +401,8 @@
<item translatable="false">AKA\'</item>
</string-array>
<!-- Phase 2 options for rest of EAP methods -->
<string-array name="wifi_phase2_entries">
<item>None</item>
<!-- Phase 2 options for TTLS -->
<string-array name="wifi_ttls_phase2_entries">
<item>PAP</item>
<item>MSCHAP</item>
<item>MSCHAPV2</item>