From b5cd542daad1ac7d9f739f8130357823630e2092 Mon Sep 17 00:00:00 2001 From: David Su Date: Fri, 10 Jan 2020 18:05:06 -0800 Subject: [PATCH] Fix CTS usages of @hide WifiSsid Migrate to WifiInfo.getSSID() and ScanResult.SSID. Bug: 144036594 Test: atest android.net.wifi.cts.ScanResultTest Change-Id: I402978d9455b0ce9e7dbcdb90836f7b0efa0fdc5 --- .../cts/net/src/android/net/wifi/cts/ScanResultTest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java b/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java index 9bd1226f52..3347cb6b04 100644 --- a/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java @@ -227,7 +227,14 @@ public class ScanResultTest extends AndroidTestCase { } assertNotNull("Current network not found in scan results", currentNetwork); - assertEquals(wifiInfo.getWifiSsid(), currentNetwork.wifiSsid); + String wifiInfoSsidQuoted = wifiInfo.getSSID(); + String scanResultSsidUnquoted = currentNetwork.SSID; + + assertEquals( + "SSID mismatch: make sure this isn't a hidden network or an SSID containing " + + "non-UTF-8 characters - neither is supported by this CTS test.", + wifiInfoSsidQuoted, + "\"" + scanResultSsidUnquoted + "\""); assertEquals(wifiInfo.getFrequency(), currentNetwork.frequency); } }