diff options
| author | Pierre Vandwalle <vandwalle@google.com> | 2015-06-22 21:14:34 -0700 |
|---|---|---|
| committer | Pierre Vandwalle <vandwalle@google.com> | 2015-06-23 14:14:41 -0700 |
| commit | be4d4bfef88bb0870e1e8bb464c302a2e54bbed4 (patch) | |
| tree | c3642c13efc127880cddbd1a671de54c46311b41 /service/java/com/android/server/wifi/WifiAutoJoinController.java | |
| parent | d9dcc7c6d03a0d93c50bada805ad4047aab8642a (diff) | |
| download | android_frameworks_opt_net_wifi-be4d4bfef88bb0870e1e8bb464c302a2e54bbed4.tar.gz android_frameworks_opt_net_wifi-be4d4bfef88bb0870e1e8bb464c302a2e54bbed4.tar.bz2 android_frameworks_opt_net_wifi-be4d4bfef88bb0870e1e8bb464c302a2e54bbed4.zip | |
prevent calling WifiNEtworkScoreCache.java with null scan result
Bug:21957885
Change-Id: I94039a4f0dd87249a4a431aa3f7c7769713843f4
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 35b0f4a42..5b63d12e2 100644 --- a/service/java/com/android/server/wifi/WifiAutoJoinController.java +++ b/service/java/com/android/server/wifi/WifiAutoJoinController.java @@ -1249,7 +1249,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) { |