Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread (e22eb863) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiStateTracker.java

+8 −12

Original line number	Diff line number	Diff line
		@@ -1285,7 +1285,6 @@ public class WifiStateTracker extends NetworkStateTracker {
		if (macaddr != null) {
		mWifiInfo.setMacAddress(macaddr);
		}
		if (mRunState == RUN_STATE_STARTING) {
		mRunState = RUN_STATE_RUNNING;
		if (!mIsScanOnly) {
		reconnectCommand();
		@@ -1295,7 +1294,6 @@ public class WifiStateTracker extends NetworkStateTracker {
		scan(true);
		}
		}
		}
		break;
		case DRIVER_HUNG:
		Log.e(TAG, "Wifi Driver reports HUNG - reloading.");
		@@ -1613,12 +1611,10 @@ public class WifiStateTracker extends NetworkStateTracker {
		}

		public synchronized boolean restart() {
		if (mRunState == RUN_STATE_STOPPED) {
		if (isDriverStopped()) {
		mRunState = RUN_STATE_STARTING;
		resetConnections(true);
		return startDriver();
		} else if (mRunState == RUN_STATE_STOPPING) {
		mRunState = RUN_STATE_STARTING;
		}
		return true;
		}