summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--service/java/com/android/server/wifi/WifiConfigStore.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 70f3a51..46250b3 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -2342,8 +2342,8 @@ public class WifiConfigStore extends IpConfigStore {
out.writeUTF(DEFAULT_GW_KEY + SEPARATOR + macAddress + NL);
}
- if (getScanDetailCache(config) != null) {
- for (ScanDetail scanDetail : getScanDetailCache(config).values()) {
+ if (getScanDetailCacheIfExist(config) != null) {
+ for (ScanDetail scanDetail : getScanDetailCacheIfExist(config).values()) {
ScanResult result = scanDetail.getScanResult();
out.writeUTF(BSSID_KEY + SEPARATOR +
result.BSSID + NL);
@@ -3339,6 +3339,12 @@ public class WifiConfigStore extends IpConfigStore {
return cache;
}
+ public ScanDetailCache getScanDetailCacheIfExist(WifiConfiguration config) {
+ if (config == null) return null;
+ return mScanDetailCaches.get(config.networkId);
+ }
+
+
/**
* This function run thru the Saved WifiConfigurations and check if some should be linked.
* @param config