diff options
author | Irfan Sheriff <isheriff@google.com> | 2011-06-10 14:00:27 -0700 |
---|---|---|
committer | Irfan Sheriff <isheriff@google.com> | 2011-06-10 17:02:48 -0700 |
commit | 1523da22e91217e06a01610c202d5e52c2e9dfce (patch) | |
tree | f21880617440a21d403750c00223b8e49da7bdcf /wifi/java/android/net/wifi/WifiMonitor.java | |
parent | e14674d51555e7c270fb10e465e906fc1b0cd607 (diff) | |
download | frameworks_base-1523da22e91217e06a01610c202d5e52c2e9dfce.zip frameworks_base-1523da22e91217e06a01610c202d5e52c2e9dfce.tar.gz frameworks_base-1523da22e91217e06a01610c202d5e52c2e9dfce.tar.bz2 |
Fix driver start/stop handling
The driver start and stop events will be removed as they are now
redundant (and incorrect)
Move to using supplicant INTERFACE_DISABLED indication for deciding
if driver has started or stopped
When driver start is given, the supplicant will first switch to
INTERFACE_DISABLED state and then out of it to start connecting.
We should use this indication to find out driver has started
When driver stop is given, the supplicant will just switch to
INTERFACE_DISABLED state and this indicates driver has stopped
Bug: 4550125
Change-Id: I242cda97951a733c8707c8d99cdfcc9a33b75c2d
Diffstat (limited to 'wifi/java/android/net/wifi/WifiMonitor.java')
-rw-r--r-- | wifi/java/android/net/wifi/WifiMonitor.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/wifi/java/android/net/wifi/WifiMonitor.java b/wifi/java/android/net/wifi/WifiMonitor.java index 4a45825..4ec4cfc 100644 --- a/wifi/java/android/net/wifi/WifiMonitor.java +++ b/wifi/java/android/net/wifi/WifiMonitor.java @@ -107,7 +107,7 @@ public class WifiMonitor { * <pre> * CTRL-EVENT-DRIVER-STATE state * </pre> - * <code>state</code> is either STARTED or STOPPED + * <code>state</code> can be HANGED */ private static final String driverStateEvent = "DRIVER-STATE"; /** @@ -304,11 +304,7 @@ public class WifiMonitor { if (state == null) { return; } - if (state.equals("STOPPED")) { - mWifiStateMachine.notifyDriverStopped(); - } else if (state.equals("STARTED")) { - mWifiStateMachine.notifyDriverStarted(); - } else if (state.equals("HANGED")) { + if (state.equals("HANGED")) { mWifiStateMachine.notifyDriverHung(); } } |