summaryrefslogtreecommitdiffstats
path: root/wifi/java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-10-26 22:23:16 -0700
committerIrfan Sheriff <isheriff@google.com>2010-10-27 11:35:35 -0700
commitfbbf6a46cd09f4c026b2537d23f55b78648adc15 (patch)
tree290bed4aec0bf3b1c714f76a34a347ffb6bf4ad5 /wifi/java
parent2088e371eddd5ff790105ed1a6bc34a7b8a0f7d8 (diff)
downloadframeworks_base-fbbf6a46cd09f4c026b2537d23f55b78648adc15.zip
frameworks_base-fbbf6a46cd09f4c026b2537d23f55b78648adc15.tar.gz
frameworks_base-fbbf6a46cd09f4c026b2537d23f55b78648adc15.tar.bz2
DO NOT MERGE fix runstate race condition
Bug: 3107829 Change-Id: I94312ad10975af24660455c3aace97634f06f3e1
Diffstat (limited to 'wifi/java')
-rw-r--r--wifi/java/android/net/wifi/WifiStateTracker.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java
index 8028fe7..a0e588d 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -601,8 +601,6 @@ public class WifiStateTracker extends NetworkStateTracker {
* Send the tracker a notification that the Wi-Fi driver has been stopped.
*/
void notifyDriverStopped() {
- mRunState = RUN_STATE_STOPPED;
-
// Send a driver stopped message to our handler
Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_STOPPED, 0).sendToTarget();
}
@@ -1301,6 +1299,9 @@ public class WifiStateTracker extends NetworkStateTracker {
}
}
break;
+ case DRIVER_STOPPED:
+ mRunState = RUN_STATE_STOPPED;
+ break;
case DRIVER_HUNG:
Log.e(TAG, "Wifi Driver reports HUNG - reloading.");
/**