commit deced11e1a3ab439b1c879dfd679f7a1c50c9f08
author Mitchell Wills <mwills@google.com> Tue Sep 01 12:21:59 2015 -0700
committer Randy Pan <zpan@google.com> Thu Dec 10 16:06:50 2015 -0800
tree 91fff399653e7fa392a9ccdc85c971987b8e4edc
parent 5374e36bb5ad5ffbe80f1a05e00356ee949c4d2e

DO NOT MERGE Don't cache ScanResults in WifiTracker if there is no SSID

Cherry-picked from 9df79043907870fd4c1bd30b460b138169b92bbf
Bug: 23528076
Change-Id: I118cfafb526fe760bf1d545e09a1559e3867ce06

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index c28288e..7b42664 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
@@ -258,6 +258,9 @@
         mScanId++;
         final List<ScanResult> newResults = mWifiManager.getScanResults();
         for (ScanResult newResult : newResults) {
+            if (newResult.SSID == null || newResult.SSID.isEmpty()) {
+                continue;
+            }
             mScanResultCache.put(newResult.BSSID, newResult);
             mSeenBssids.put(newResult.BSSID, mScanId);
         }