diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-12-13 18:51:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-13 18:51:59 +0000 |
| commit | d505cbe510e1600162e1128c1b30270647feae98 (patch) | |
| tree | 55a1e091d7b6c7eca8ff9410521741fb7990f492 | |
| parent | 901a2f5a351f32f4870d48f2cf378401ee2f61fb (diff) | |
| parent | db144d481502fafec1c9249bf29628d3a157298a (diff) | |
Merge "DO NOT MERGE: WifiStateMachine: Add null check in CMD_AUTO_ROAM" into nyc-mr2-dev
| -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); |