diff options
Diffstat (limited to 'tests/wifitests/src/com/android/server')
3 files changed, 4 insertions, 5 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java index f69574ea6..7336c4119 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java @@ -80,7 +80,6 @@ public class NetworkListStoreDataTest { + "<byte-array name=\"AllowedGroupMgmtCiphers\" num=\"0\"></byte-array>\n" + "<byte-array name=\"AllowedSuiteBCiphers\" num=\"0\"></byte-array>\n" + "<boolean name=\"Shared\" value=\"%s\" />\n" - + "<int name=\"MacRandomizationSetting\" value=\"1\" />\n" + "<int name=\"Status\" value=\"2\" />\n" + "<null name=\"FQDN\" />\n" + "<null name=\"ProviderFriendlyName\" />\n" @@ -102,6 +101,7 @@ public class NetworkListStoreDataTest { + "<boolean name=\"IsLegacyPasspointConfig\" value=\"false\" />\n" + "<long-array name=\"RoamingConsortiumOIs\" num=\"0\" />\n" + "<string name=\"RandomizedMacAddress\">%s</string>\n" + + "<int name=\"MacRandomizationSetting\" value=\"1\" />\n" + "</WifiConfiguration>\n" + "<NetworkStatus>\n" + "<string name=\"SelectionStatus\">NETWORK_SELECTION_ENABLED</string>\n" @@ -135,7 +135,6 @@ public class NetworkListStoreDataTest { + "<byte-array name=\"AllowedGroupMgmtCiphers\" num=\"0\"></byte-array>\n" + "<byte-array name=\"AllowedSuiteBCiphers\" num=\"0\"></byte-array>\n" + "<boolean name=\"Shared\" value=\"%s\" />\n" - + "<int name=\"MacRandomizationSetting\" value=\"1\" />\n" + "<int name=\"Status\" value=\"2\" />\n" + "<null name=\"FQDN\" />\n" + "<null name=\"ProviderFriendlyName\" />\n" @@ -157,6 +156,7 @@ public class NetworkListStoreDataTest { + "<boolean name=\"IsLegacyPasspointConfig\" value=\"false\" />\n" + "<long-array name=\"RoamingConsortiumOIs\" num=\"0\" />\n" + "<string name=\"RandomizedMacAddress\">%s</string>\n" + + "<int name=\"MacRandomizationSetting\" value=\"1\" />\n" + "</WifiConfiguration>\n" + "<NetworkStatus>\n" + "<string name=\"SelectionStatus\">NETWORK_SELECTION_ENABLED</string>\n" @@ -375,7 +375,6 @@ public class NetworkListStoreDataTest { + "<byte-array name=\"AllowedGroupMgmtCiphers\" num=\"0\"></byte-array>\n" + "<byte-array name=\"AllowedSuiteBCiphers\" num=\"0\"></byte-array>\n" + "<boolean name=\"Shared\" value=\"%s\" />\n" - + "<int name=\"MacRandomizationSetting\" value=\"1\" />\n" + "<null name=\"FQDN\" />\n" + "<null name=\"ProviderFriendlyName\" />\n" + "<null name=\"LinkedNetworksList\" />\n" @@ -393,6 +392,7 @@ public class NetworkListStoreDataTest { + "<null name=\"LastUpdateName\" />\n" + "<int name=\"LastConnectUid\" value=\"0\" />\n" + "<string name=\"RandomizedMacAddress\">%s</string>\n" + + "<int name=\"MacRandomizationSetting\" value=\"1\" />\n" + "</WifiConfiguration>\n" + "<NetworkStatus>\n" + "<string name=\"SelectionStatus\">NETWORK_SELECTION_ENABLED</string>\n" diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java index c2d2ecd22..6693d86bb 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java @@ -85,7 +85,6 @@ public class WifiConfigStoreTest { + "<byte-array name=\"AllowedGroupMgmtCiphers\" num=\"0\"></byte-array>\n" + "<byte-array name=\"AllowedSuiteBCiphers\" num=\"0\"></byte-array>\n" + "<boolean name=\"Shared\" value=\"%s\" />\n" - + "<int name=\"MacRandomizationSetting\" value=\"1\" />\n" + "<int name=\"Status\" value=\"2\" />\n" + "<null name=\"FQDN\" />\n" + "<null name=\"ProviderFriendlyName\" />\n" @@ -107,6 +106,7 @@ public class WifiConfigStoreTest { + "<boolean name=\"IsLegacyPasspointConfig\" value=\"false\" />\n" + "<long-array name=\"RoamingConsortiumOIs\" num=\"0\" />\n" + "<string name=\"RandomizedMacAddress\">%s</string>\n" + + "<int name=\"MacRandomizationSetting\" value=\"1\" />\n" + "</WifiConfiguration>\n" + "<NetworkStatus>\n" + "<string name=\"SelectionStatus\">NETWORK_SELECTION_ENABLED</string>\n" diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java index 00749ac7d..aeaba182d 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java @@ -532,7 +532,6 @@ public class WifiConfigurationTestUtil { assertEquals(expected.allowedPairwiseCiphers, actual.allowedPairwiseCiphers); assertEquals(expected.shared, actual.shared); assertEquals(expected.getIpConfiguration(), actual.getIpConfiguration()); - assertEquals(expected.macRandomizationSetting, actual.macRandomizationSetting); } /** |