summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-11-30 11:45:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-30 11:45:45 -0800
commitea6bb1b4d7111dfd084f772f83094bda662fdb23 (patch)
tree7a5abfd165b8d4dfa4eb2fd3dde51d068286eb32 /wifi
parente843dfa8dcd0a7bfa956b75424bb5db834975a64 (diff)
parentee93169ed1072d3be627601223dafbcc061e7568 (diff)
downloadframeworks_base-ea6bb1b4d7111dfd084f772f83094bda662fdb23.zip
frameworks_base-ea6bb1b4d7111dfd084f772f83094bda662fdb23.tar.gz
frameworks_base-ea6bb1b4d7111dfd084f772f83094bda662fdb23.tar.bz2
am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread
* commit 'ee93169ed1072d3be627601223dafbcc061e7568': DO NOT MERGE fix runstate race condition
Diffstat (limited to 'wifi')
-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 bcbd07c..b57f51f 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -602,8 +602,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();
}
@@ -1302,6 +1300,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.");
/**