diff options
| author | Ethan Chen <intervigil@gmail.com> | 2016-02-03 09:30:54 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-02-03 09:30:54 -0800 |
| commit | 2d664bbde23e89a5a9c939631a8b185501408c0b (patch) | |
| tree | 9c4ee2c598414929d4e4356965a3c8a27c8f22fe /service | |
| parent | bb978df9cb645062b4707e0bde82abe5b13fafce (diff) | |
| parent | 1fbe9471a63caf10ad32ed569f5a61bd1ff43a91 (diff) | |
| download | frameworks_opt_net_wifi-2d664bbde23e89a5a9c939631a8b185501408c0b.tar.gz frameworks_opt_net_wifi-2d664bbde23e89a5a9c939631a8b185501408c0b.tar.bz2 frameworks_opt_net_wifi-2d664bbde23e89a5a9c939631a8b185501408c0b.zip | |
Merge "Kill wpa_supplicant before load driver" into cm-13.0
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index da7a395..e025799 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -6030,6 +6030,12 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno logStateAndMessage(message, getClass().getSimpleName()); switch (message.what) { case CMD_START_SUPPLICANT: + /* Stop a running supplicant after a runtime restart + * Avoids issues with drivers that do not handle interface down + * on a running supplicant properly. + */ + mWifiMonitor.killSupplicant(mP2pSupported); + if (mWifiNative.loadDriver()) { try { mNwService.wifiFirmwareReload(mInterfaceName, "STA"); @@ -6061,12 +6067,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno loge("Unable to change interface settings: " + ie); } - /* Stop a running supplicant after a runtime restart - * Avoids issues with drivers that do not handle interface down - * on a running supplicant properly. - */ - mWifiMonitor.killSupplicant(mP2pSupported); - if (WifiNative.startHal() == false) { /* starting HAL is optional */ loge("Failed to start HAL"); |