Merge "NPE in WifiNetworkSelector" into rvc-dev

1 files changed, 3 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java
index 7e95fba0b..f59a50fc2 100644
--- a/service/java/com/android/server/wifi/WifiNetworkSelector.java
+++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java
@@ -940,6 +940,9 @@ public class WifiNetworkSelector {
         }
         WifiConfiguration config =
                 mWifiConfigManager.getConfiguredNetwork(choice.candidateKey.networkId);
+        if (config == null) {
+            return;
+        }
         if (config.isPasspoint()) {
             config.SSID = choice.candidateKey.matchInfo.networkSsid;
             mWifiConfigManager.addOrUpdateNetwork(config, config.creatorUid, config.creatorName);