commit fc542a98eb74d87944c4786849fe3c2116431910
author Hai Shalom <haishalom@google.com> Mon Nov 12 11:49:05 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Tue Nov 13 00:22:07 2018 +0000
tree d4049bb746476689bef924ffb046d61a4a1d1e02
parent 7193512058a936e879644b7a0dc5e0f0f621ec43

Fix Wi-Fi setup in setup wizard

Fix Wi-Fi setup in setup wizard; New WPA3/OWE networks added to
arrays.xml in an order of security caused a mismatch in the network type
index in SUW. Workaround to append the new string instead. Will require
additional work.

Bug: 119385642
Test: Setup wizard and settings app functional test
Change-Id: I6d95213a24de274f686ab372bb5fc69128a07e56
(cherry picked from commit 4864624c3d6a814a222611bad2ea4d3163f9b55a)

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c3faaba..4bd86dc 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -215,11 +215,11 @@
     <string-array name="wifi_security">
         <!-- The Wi-Fi network does not have any security. -->
         <item>@string/wifi_security_none</item>
-        <item translatable="false">@string/wifi_security_owe</item>
         <item translatable="false">@string/wifi_security_wep</item>
         <item translatable="false">@string/wifi_security_psk_generic</item>
-        <item translatable="false">@string/wifi_security_sae</item>
         <item translatable="false">@string/wifi_security_eap</item>
+        <item translatable="false">@string/wifi_security_owe</item>
+        <item translatable="false">@string/wifi_security_sae</item>
         <item translatable="false">@string/wifi_security_eap_suiteb</item>
     </string-array>