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

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

Browse Source 
Merge commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902' into gingerbread-plus-aosp

* commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902':
  fix start driver for corner cases DO NOT MERGE
This commit is contained in:
Irfan Sheriff
2010-10-12 14:59:20 -07:00
committed by Android Git Automerger
parent 9a12a3c8d4 e22eb863dc
commit a9c2ef8464
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

@@ -1286,15 +1286,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;
@@ -1614,12 +1612,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;
} }