diff options
| author | Oscar Shu <xshu@google.com> | 2020-05-30 02:49:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-30 02:49:07 +0000 |
| commit | 5ffdde0df51ceab25f97ee4ac87a2814a2d7640c (patch) | |
| tree | bb4e85d30d9a5428d67f35ec8e273f0594ad7d86 /service | |
| parent | 4c324bef94bacc4d6f2f761dd286c43f72b5f773 (diff) | |
| parent | ec537bea685ad012d36b354552ec3b1f7ba62645 (diff) | |
Merge "NPE in WifiNetworkSelector" into rvc-dev
Diffstat (limited to 'service')
| -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); |