summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorxshu <xshu@google.com>2020-05-29 13:43:38 -0700
committerxshu <xshu@google.com>2020-05-29 13:43:38 -0700
commitec537bea685ad012d36b354552ec3b1f7ba62645 (patch)
tree56d715b39b3d852e3512b03922985f24986ab485 /service
parent8dddd90021f0d9419a3caf4cd07ba4c5af8746c7 (diff)
NPE in WifiNetworkSelector
Bug: 157680802 Test: atest com.android.server.wifi Change-Id: I1b667a7fc1c7d37aac782fcefb6bc157df811e68
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiNetworkSelector.java3
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);