Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread

Browse Source 
* commit 'ee93169ed1072d3be627601223dafbcc061e7568':
  DO NOT MERGE fix runstate race condition
This commit is contained in:
Irfan Sheriff
2010-11-30 11:45:45 -08:00
committed by Android Git Automerger
parent e843dfa8dc ee93169ed1
commit ea6bb1b4d7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wifi/java/android/net/wifi/WifiStateTracker.java
View File

@@ -602,8 +602,6 @@ public class WifiStateTracker extends NetworkStateTracker {
* Send the tracker a notification that the Wi-Fi driver has been stopped. * Send the tracker a notification that the Wi-Fi driver has been stopped.
*/ */
void notifyDriverStopped() { void notifyDriverStopped() {
mRunState = RUN_STATE_STOPPED;
// Send a driver stopped message to our handler // Send a driver stopped message to our handler
Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_STOPPED, 0).sendToTarget(); Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_STOPPED, 0).sendToTarget();
} }
@@ -1302,6 +1300,9 @@ public class WifiStateTracker extends NetworkStateTracker {
} }
} }
break; break;
case DRIVER_STOPPED:
mRunState = RUN_STATE_STOPPED;
break;
case DRIVER_HUNG: case DRIVER_HUNG:
Log.e(TAG, "Wifi Driver reports HUNG - reloading."); Log.e(TAG, "Wifi Driver reports HUNG - reloading.");
/** /**