Merge "WifiConfigManager: convert BSSID to lower case" into oc-dev

am: 42e4920fdc

Change-Id: I06c8477d69f81332e8513852efd373bf1193a438

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
index 987c50937..f61013841 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
@@ -3170,6 +3170,24 @@ public class WifiConfigManagerTest {
                 result.getNetworkId()); // Update networkID
     }
 
+    /**
+     * Verifies that the app specified BSSID is converted and saved in lower case.
+     */
+    @Test
+    public void testAppSpecifiedBssidIsSavedInLowerCase() {
+        final String bssid = "0A:08:5C:BB:89:6D"; // upper case
+        WifiConfiguration openNetwork = WifiConfigurationTestUtil.createOpenNetwork();
+        openNetwork.BSSID = bssid;
+
+        NetworkUpdateResult result = verifyAddNetworkToWifiConfigManager(openNetwork);
+
+        WifiConfiguration retrievedNetwork = mWifiConfigManager.getConfiguredNetwork(
+                result.getNetworkId());
+
+        assertNotEquals(retrievedNetwork.BSSID, bssid);
+        assertEquals(retrievedNetwork.BSSID, bssid.toLowerCase());
+    }
+
     private NetworkUpdateResult verifyAddOrUpdateNetworkWithProxySettingsAndPermissions(
             boolean withConfOverride,
             boolean withProfileOwnerPolicy,