Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arc Wang
2019-11-21 05:54:12 +00:00
committed by Android (Google) Code Review
parent 76756f43db 41661fe69c
commit ade3cc7b49
4 changed files with 77 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/wifi_dialog.xml
View File

@@ -156,8 +156,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_spinner"
android:prompt="@string/please_select_phase2"
android:entries="@array/wifi_phase2_entries" />
android:prompt="@string/please_select_phase2" />
</LinearLayout>
<LinearLayout android:id="@+id/l_ca_cert"

7
res/values/arrays.xml
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>