From b55924f05bde1a901aa0ef45368b47cd06816658 Mon Sep 17 00:00:00 2001 From: Nate Jiang Date: Fri, 21 Jun 2019 11:12:50 -0700 Subject: opt/net/wifi/util: add WPA2 symbol For apps compatibility, add "WPA2" for WPA2 network, in the same time keep "RSN" for WPA2 and WPA3 network. Test: atest android.net.wifi Test: atest com.android.server.wifi Test: ACTS WifiNetworkRequestTest to print out scan result Bug: 135733338 Change-Id: I133b52b9b0d7b94680394b4b0e22f4eb77b9ee25 --- .../com/android/server/wifi/util/InformationElementUtilTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java index 854458316..dd567053c 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/InformationElementUtilTest.java @@ -268,7 +268,7 @@ public class InformationElementUtilTest { capabilities.from(ies, beaconCap, false); String result = capabilities.generateCapabilitiesString(); - assertEquals("[RSN-PSK-CCMP+TKIP]", result); + assertEquals("[WPA2-PSK-CCMP+TKIP][RSN-PSK-CCMP+TKIP]", result); } /** @@ -384,7 +384,7 @@ public class InformationElementUtilTest { capabilities.from(ies, beaconCap, false); String result = capabilities.generateCapabilitiesString(); - assertEquals("[WPA-PSK-CCMP+TKIP][RSN-PSK-CCMP+TKIP]", result); + assertEquals("[WPA-PSK-CCMP+TKIP][WPA2-PSK-CCMP+TKIP][RSN-PSK-CCMP+TKIP]", result); } /** @@ -423,7 +423,7 @@ public class InformationElementUtilTest { capabilities.from(ies, beaconCap, true); String result = capabilities.generateCapabilitiesString(); - assertEquals("[RSN-PSK+SAE-CCMP]", result); + assertEquals("[WPA2-PSK-CCMP][RSN-PSK+SAE-CCMP]", result); } /** -- cgit v1.2.3