From 8f5c6f25e0b8266b3bae3540e854d67442bc60d2 Mon Sep 17 00:00:00 2001 From: Sohani Rao Date: Sun, 9 Jul 2017 17:21:20 -0700 Subject: WificondControl: SSID field verification in scan result SSID field of the scan result from wificond is being verified against the SSID extracted from the IEs. When scan results are obtained from Offload HAL, no IEs are available. Remove this check to avoid dropping the scan results erroneously Bug: 63148974 Test: Unit tests, on-device test for connecting to a network found by Offload HAL during Pno scans Change-Id: Ia5e6a85ba497ae3ac47729dddddf7ad45d263e55 --- service/java/com/android/server/wifi/WificondControl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/service/java/com/android/server/wifi/WificondControl.java b/service/java/com/android/server/wifi/WificondControl.java index 0071ea4ee..2f829fcc1 100644 --- a/service/java/com/android/server/wifi/WificondControl.java +++ b/service/java/com/android/server/wifi/WificondControl.java @@ -352,10 +352,6 @@ public class WificondControl { NetworkDetail networkDetail = new NetworkDetail(bssid, ies, null, result.frequency); - if (!wifiSsid.toString().equals(networkDetail.getTrimmedSSID())) { - Log.e(TAG, "Inconsistent SSID on BSSID: " + bssid); - continue; - } ScanDetail scanDetail = new ScanDetail(networkDetail, wifiSsid, bssid, flags, result.signalMbm / 100, result.frequency, result.tsf, ies, null); // Update carrier network info if this AP's SSID is associated with a carrier Wi-Fi -- cgit v1.2.3