diff options
| author | Pierre Vandwalle <vandwalle@google.com> | 2015-06-23 22:31:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 22:31:14 +0000 |
| commit | 36375b663fcb5d3deb0119359b03623717d933aa (patch) | |
| tree | fb66bfaf5cac4b44fee27927125d2d4bac3e65d7 /service/java/com/android/server/wifi/WifiAutoJoinController.java | |
| parent | 903814ca886b4a090816216d5e8464b65b0121c9 (diff) | |
| parent | be4d4bfef88bb0870e1e8bb464c302a2e54bbed4 (diff) | |
| download | android_frameworks_opt_net_wifi-36375b663fcb5d3deb0119359b03623717d933aa.tar.gz android_frameworks_opt_net_wifi-36375b663fcb5d3deb0119359b03623717d933aa.tar.bz2 android_frameworks_opt_net_wifi-36375b663fcb5d3deb0119359b03623717d933aa.zip | |
Merge "prevent calling WifiNEtworkScoreCache.java with null scan result Bug:21957885" into mnc-dev
Diffstat (limited to 'service/java/com/android/server/wifi/WifiAutoJoinController.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiAutoJoinController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiAutoJoinController.java b/service/java/com/android/server/wifi/WifiAutoJoinController.java index ec8f7d78b..07382d6c5 100644 --- a/service/java/com/android/server/wifi/WifiAutoJoinController.java +++ b/service/java/com/android/server/wifi/WifiAutoJoinController.java @@ -1234,7 +1234,8 @@ public class WifiAutoJoinController { // keep going - it could be that another BSSID is in range (has been seen recently) which // has a score, even if the one we're immediately connected to doesn't. ScanResult currentScanResult = mWifiStateMachine.getCurrentScanResult(); - boolean currentNetworkHasScoreCurve = mNetworkScoreCache.hasScoreCurve(currentScanResult); + boolean currentNetworkHasScoreCurve = currentScanResult != null + && mNetworkScoreCache.hasScoreCurve(currentScanResult); if (ephemeralOutOfRangeTimeoutMs <= 0 || currentNetworkHasScoreCurve) { if (DBG) { if (currentNetworkHasScoreCurve) { |