diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-04-16 22:00:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-16 22:00:11 +0000 |
| commit | d12a7645a3bf3ffa83b8041bf343f1dc12a2381f (patch) | |
| tree | 1800e12f4a6e233580df8a6fb564645a10ea8e38 /wifi/java/android | |
| parent | ad435ba7fff45b8a15ebda08f88767511935a5d7 (diff) | |
| parent | b8df5451f416db17dc4c7d5a7e106a861b11ac0a (diff) | |
| download | frameworks_base-d12a7645a3bf3ffa83b8041bf343f1dc12a2381f.zip frameworks_base-d12a7645a3bf3ffa83b8041bf343f1dc12a2381f.tar.gz frameworks_base-d12a7645a3bf3ffa83b8041bf343f1dc12a2381f.tar.bz2 | |
Merge "Fix enabling networks after driver stop" into jb-mr2-dev
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index a5d98cc..2c3df95 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -2383,6 +2383,8 @@ public class WifiStateMachine extends StateMachine { mWifiNative.disconnect(); transitionTo(mScanModeState); } else { + /* Driver stop may have disabled networks, enable right after start */ + mWifiConfigStore.enableAllNetworks(); mWifiNative.reconnect(); // Status pulls in the current supplicant state and network connection state // events over the monitor connection. This helps framework sync up with |