The order of networks saved to disk based on SSID

Bug: 150798326
Test: atest com.android.server.wifi
Change-Id: I101dea21b2899274e6615ad9cb962c2d58c4dcda

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java
index 702476317..64680794b 100644
--- a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java
@@ -31,6 +31,7 @@ import android.util.Xml;
 import androidx.test.filters.SmallTest;
 
 import com.android.internal.util.FastXmlSerializer;
+import com.android.server.wifi.util.ScanResultUtil;
 import com.android.server.wifi.util.WifiConfigStoreEncryptionUtil;
 import com.android.server.wifi.util.XmlUtilTest;
 
@@ -46,6 +47,8 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -700,4 +703,26 @@ public class NetworkListStoreDataTest extends WifiBaseTest {
         WifiConfigurationTestUtil.assertConfigurationsEqualForConfigStore(
                 oemUserSavedNetworks, parsedNetworks);
     }
+
+    /**
+     * The WifiConfiguration store should follow the sort of the SSIDs.
+     */
+    @Test
+    public void testWifiConfigSaveToStoreOrder() throws Exception {
+        String testSSID = "TEST_SSID";
+        List<WifiConfiguration> storedWIfiConfig = new ArrayList<>();
+        for (int i = 1; i <= 1; i++) {
+            WifiConfiguration network = WifiConfigurationTestUtil.createOpenNetwork(
+                    ScanResultUtil.createQuotedSSID(testSSID + (1 - i)));
+            network.creatorName = TEST_CREATOR_NAME;
+        }
+        // Add to store data based on added order.
+        mNetworkListSharedStoreData.setConfigurations(storedWIfiConfig);
+        byte[] output1 = serializeData();
+        // Add to store data based on SSID sort.
+        Collections.sort(storedWIfiConfig, Comparator.comparing(a -> a.SSID));
+        mNetworkListSharedStoreData.setConfigurations(storedWIfiConfig);
+        byte[] output2 = serializeData();
+        assertArrayEquals(output2, output1);
+    }
 }