Merge "wlan: Fix to handle the failure status on supplicant start." (85e08c94) · Commits · e / os / android_frameworks_base

services/java/com/android/server/wifi/WifiController.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ import android.net.wifi.WifiManager;
		import static android.net.wifi.WifiManager.WIFI_MODE_FULL;
		import static android.net.wifi.WifiManager.WIFI_MODE_FULL_HIGH_PERF;
		import static android.net.wifi.WifiManager.WIFI_MODE_SCAN_ONLY;
		import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED;
		import static android.net.wifi.WifiManager.WIFI_STATE_ENABLING;
		import android.net.wifi.WifiStateMachine;
		import android.os.Handler;
		import android.os.Looper;
		@@ -465,6 +467,7 @@ class WifiController extends StateMachine {
		public boolean processMessage(Message msg) {
		switch (msg.what) {
		case CMD_WIFI_TOGGLED:
		int mWifiState = mWifiStateMachine.syncGetWifiState();
		if (! mSettingsStore.isWifiToggleEnabled()) {
		if (mSettingsStore.isScanAlwaysAvailable()) {
		transitionTo(mStaDisabledWithScanState);
		@@ -472,6 +475,13 @@ class WifiController extends StateMachine {
		transitionTo(mApStaDisabledState);
		}
		}
		if ((mWifiState != WIFI_STATE_ENABLING) &&
		(mWifiState != WIFI_STATE_ENABLED)) {
		if (DBG) {
		Slog.d(TAG, "Mismatch in the state " + mWifiState);
		}
		mWifiStateMachine.setSupplicantRunning(true);
		}
		break;
		case CMD_AIRPLANE_TOGGLED:
		/* When wi-fi is turned off due to airplane,