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

Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread

Browse Source
This commit is contained in:
Irfan Sheriff
2010-10-12 14:55:52 -07:00
committed by Android (Google) Code Review
parent ba79909860 bf844308a2
commit e22eb863dc
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1285,15 +1285,13 @@ public class WifiStateTracker extends NetworkStateTracker {
if (macaddr != null) { if (macaddr != null) {
mWifiInfo.setMacAddress(macaddr); mWifiInfo.setMacAddress(macaddr);
} }
if (mRunState == RUN_STATE_STARTING) { mRunState = RUN_STATE_RUNNING;
mRunState = RUN_STATE_RUNNING; if (!mIsScanOnly) {
if (!mIsScanOnly) { reconnectCommand();
reconnectCommand(); } else {
} else { // In some situations, supplicant needs to be kickstarted to
// In some situations, supplicant needs to be kickstarted to // start the background scanning
// start the background scanning scan(true);
scan(true);
}
} }
} }
break; break;
@@ -1613,12 +1611,10 @@ public class WifiStateTracker extends NetworkStateTracker {
} }
public synchronized boolean restart() { public synchronized boolean restart() {
if (mRunState == RUN_STATE_STOPPED) { if (isDriverStopped()) {
mRunState = RUN_STATE_STARTING; mRunState = RUN_STATE_STARTING;
resetConnections(true); resetConnections(true);
return startDriver(); return startDriver();
} else if (mRunState == RUN_STATE_STOPPING) {
mRunState = RUN_STATE_STARTING;
} }
return true; return true;
} }