diff options
| author | Roshan Pius <rpius@google.com> | 2016-12-01 15:40:22 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2016-12-13 17:24:13 +0000 |
| commit | db144d481502fafec1c9249bf29628d3a157298a (patch) | |
| tree | 1c7d134d3edd4d0038409c8a6cc5c43cd7c879cc /service | |
| parent | c05b60f706ef4cbee6d12c01224afe07fad725be (diff) | |
| download | android_frameworks_opt_net_wifi-db144d481502fafec1c9249bf29628d3a157298a.tar.gz android_frameworks_opt_net_wifi-db144d481502fafec1c9249bf29628d3a157298a.tar.bz2 android_frameworks_opt_net_wifi-db144d481502fafec1c9249bf29628d3a157298a.zip | |
DO NOT MERGE: WifiStateMachine: Add null check in CMD_AUTO_ROAM
The crash reported by the user seems to have occured as the user
was turning off/on wifi.
The networkID selected by WifiConnectivityManager may be invalid by
the time this message is processed by WifiStateMachine. So, add an
explicit null check to abort the roam request.
Bug: 33106930
Test: Will send for regression tests.
Change-Id: I992a35e099d7af922da046107fa8e41052b5d2c1
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 0c7e987ee..f325bed29 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -7270,6 +7270,10 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss break; } else { config = mWifiConfigManager.getWifiConfiguration(netId); + if (config == null) { + loge("AUTO_ROAM and invalid netowrk ID, bail out..."); + break; + } } setTargetBssid(config, bssid); |