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

Porting change I064698b3 from mr2 to eclair.

Browse Source 
Add support for "HANGED" driver state - we'll reboot the driver when requested (by the driver).

bug: 2310372
This commit is contained in:
Robert Greenwalt
2009-12-08 15:37:47 -08:00
parent 767eb427fa
commit 68b15b6849
2 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/WifiMonitor.java
View File

@@ -255,6 +255,8 @@ public class WifiMonitor {
mWifiStateTracker.notifyDriverStopped(); mWifiStateTracker.notifyDriverStopped();
} else if (state.equals("STARTED")) { } else if (state.equals("STARTED")) {
mWifiStateTracker.notifyDriverStarted(); mWifiStateTracker.notifyDriverStarted();
} else if (state.equals("HANGED")) {
mWifiStateTracker.notifyDriverHung();
} }
} }

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

@@ -87,11 +87,18 @@ public class WifiStateTracker extends NetworkStateTracker {
/** /**
* The driver is started or stopped. The object will be the state: true for * The driver is started or stopped. The object will be the state: true for
* started, false for stopped. * started, false for stopped.
*/ */
private static final int EVENT_DRIVER_STATE_CHANGED = 12; private static final int EVENT_DRIVER_STATE_CHANGED = 12;
private static final int EVENT_PASSWORD_KEY_MAY_BE_INCORRECT = 13; private static final int EVENT_PASSWORD_KEY_MAY_BE_INCORRECT = 13;
private static final int EVENT_MAYBE_START_SCAN_POST_DISCONNECT = 14; private static final int EVENT_MAYBE_START_SCAN_POST_DISCONNECT = 14;
/**
* The driver state indication.
*/
private static final int DRIVER_STARTED = 0;
private static final int DRIVER_STOPPED = 1;
private static final int DRIVER_HUNG = 2;
/** /**
* Interval in milliseconds between polling for connection * Interval in milliseconds between polling for connection
* status items that are not sent via asynchronous events. * status items that are not sent via asynchronous events.
@@ -556,7 +563,7 @@ public class WifiStateTracker extends NetworkStateTracker {
mRunState = RUN_STATE_STOPPED; 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, 0, 0).sendToTarget(); Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_STOPPED, 0).sendToTarget();
} }
/** /**
@@ -565,9 +572,17 @@ public class WifiStateTracker extends NetworkStateTracker {
*/ */
void notifyDriverStarted() { void notifyDriverStarted() {
// Send a driver started message to our handler // Send a driver started message to our handler
Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, 1, 0).sendToTarget(); Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_STARTED, 0).sendToTarget();
} }
/**
* Send the tracker a notification that the Wi-Fi driver has hung and needs restarting.
*/
void notifyDriverHung() {
// Send a driver hanged message to our handler
Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_HUNG, 0).sendToTarget();
}
/** /**
* Set the interval timer for polling connection information * Set the interval timer for polling connection information
* that is not delivered asynchronously. * that is not delivered asynchronously.
@@ -1155,17 +1170,16 @@ public class WifiStateTracker extends NetworkStateTracker {
} }
} }
break; break;
case EVENT_DRIVER_STATE_CHANGED: case EVENT_DRIVER_STATE_CHANGED:
boolean driverStarted = msg.arg1 != 0;
// Wi-Fi driver state changed: // Wi-Fi driver state changed:
// [31- 1] Reserved for future use // 0 STARTED
// [ 0- 0] Driver start (1) or stopped (0) // 1 STOPPED
eventLogParam = driverStarted ? 1 : 0; // 2 HUNG
EventLog.writeEvent(EVENTLOG_DRIVER_STATE_CHANGED, eventLogParam); EventLog.writeEvent(EVENTLOG_DRIVER_STATE_CHANGED, msg.arg1);
if (driverStarted) { switch (msg.arg1) {
case DRIVER_STARTED:
/** /**
* Set the number of allowed radio channels according * Set the number of allowed radio channels according
* to the system setting, since it gets reset by the * to the system setting, since it gets reset by the
@@ -1184,6 +1198,15 @@ public class WifiStateTracker extends NetworkStateTracker {
} }
} }
} }
break;
case DRIVER_HUNG:
Log.e(TAG, "Wifi Driver reports HUNG - reloading.");
/**
* restart the driver - toggle off and on
*/
mWM.setWifiEnabled(false);
mWM.setWifiEnabled(true);
break;
} }
noteRunState(); noteRunState();
break; break;