Merge "hotspot2: cache ScanDetail for Passpoint network"

2 files changed, 17 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index e4bf1e4f4..17110f319 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -1877,6 +1877,22 @@ public class WifiConfigManager {
     }
 
     /**
+     * Save the ScanDetail to the ScanDetailCache of the given network.  This is used
+     * by {@link com.android.server.wifi.hotspot2.PasspointNetworkEvaluator} for caching
+     * ScanDetail for newly created {@link WifiConfiguration} for Passpoint network.
+     *
+     * @param networkId The ID of the network to save ScanDetail to
+     * @param scanDetail The ScanDetail to cache
+     */
+    public void updateScanDetailForNetwork(int networkId, ScanDetail scanDetail) {
+        WifiConfiguration network = getInternalConfiguredNetwork(networkId);
+        if (network == null) {
+            return;
+        }
+        saveToScanDetailCacheForNetwork(network, scanDetail);
+    }
+
+    /**
      * Helper method to check if the 2 provided networks can be linked or not.
      * Networks are considered for linking if:
      * 1. Share the same GW MAC address.
diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointNetworkEvaluator.java b/service/java/com/android/server/wifi/hotspot2/PasspointNetworkEvaluator.java
index 77b29a8da..5eafc1759 100644
--- a/service/java/com/android/server/wifi/hotspot2/PasspointNetworkEvaluator.java
+++ b/service/java/com/android/server/wifi/hotspot2/PasspointNetworkEvaluator.java
@@ -126,6 +126,7 @@ public class PasspointNetworkEvaluator implements WifiNetworkSelector.NetworkEva
         }
         mWifiConfigManager.setNetworkCandidateScanResult(result.getNetworkId(),
                 scanDetail.getScanResult(), 0);
+        mWifiConfigManager.updateScanDetailForNetwork(result.getNetworkId(), scanDetail);
         return mWifiConfigManager.getConfiguredNetwork(result.getNetworkId());
     }