diff options
| author | Oscar Shu <xshu@google.com> | 2020-05-30 03:24:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-30 03:24:28 +0000 |
| commit | 7f47a503069f87c1dbbdb385c999b85dcebf091b (patch) | |
| tree | ad3993cb783f3c33b513aa6ca5178ff6e727b0e9 | |
| parent | df80349f21d8f80602eaa24cc5034869e923f323 (diff) | |
| parent | 513270193903c1b4a04c70a5b0085fb2fce31bcb (diff) | |
Merge "NPE in WifiNetworkSelector" into rvc-dev am: 5ffdde0df5 am: 5132701939
Change-Id: I942b9340470a6a6cbfc35875f384bfac268c76ad
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkSelector.java | 3 |
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); |