diff options
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConnectivityManager.java | 7 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkSelector.java | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java index 1beb9e80c8..1b45c480ee 100644 --- a/service/java/com/android/server/wifi/WifiConnectivityManager.java +++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java @@ -362,6 +362,13 @@ public class WifiConnectivityManager { mWifiLastResortWatchdog.updateAvailableNetworks( mNetworkSelector.getConnectableScanDetails()); mWifiMetrics.countScanResults(scanDetails); + // No candidates, return early. + if (candidates == null || candidates.size() == 0) { + localLog(listenerName + ": No candidates"); + mWifiMetrics.noteFirstNetworkSelectionAfterBoot(false); + handleScanResultsListener.onHandled(false); + return; + } handleCandidatesFromScanResultsForPrimaryCmm( listenerName, candidates, handleScanResultsListener); } diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java index ff348083ca..88de1a60da 100644 --- a/service/java/com/android/server/wifi/WifiNetworkSelector.java +++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java @@ -812,7 +812,7 @@ public class WifiNetworkSelector { * @return WifiConfiguration - the selected network, or null. */ @Nullable - public WifiConfiguration selectNetwork(List<WifiCandidates.Candidate> candidates) { + public WifiConfiguration selectNetwork(@NonNull List<WifiCandidates.Candidate> candidates) { if (candidates == null || candidates.size() == 0) { return null; } |