Merge "wlan: Error handling on PNO failure due to active P2P session." (942ac554) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiNative.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -465,11 +465,13 @@ public class WifiNative {
		return doBooleanCommand("DRIVER COUNTRY " + countryCode.toUpperCase(Locale.ROOT));
		}

		public void enableBackgroundScan(boolean enable) {
		public boolean enableBackgroundScan(boolean enable) {
		if (enable) {
		doBooleanCommand("SET pno 1");
		Log.e(mTAG, "doBoolean: enable");
		return doBooleanCommand("SET pno 1");
		} else {
		doBooleanCommand("SET pno 0");
		Log.e(mTAG, "doBoolean: disable");
		return doBooleanCommand("SET pno 0");
		}
		}

+15 −4

Original line number	Diff line number	Diff line
		@@ -3895,7 +3895,11 @@ public class WifiStateMachine extends StateMachine {
		* cleared
		*/
		if (!mScanResultIsPending) {
		mWifiNative.enableBackgroundScan(true);
		if (!mWifiNative.enableBackgroundScan(true)) {
		setScanAlarm(true);
		} else {
		setScanAlarm(false);
		}
		}
		} else {
		setScanAlarm(true);
		@@ -3949,8 +3953,11 @@ public class WifiStateMachine extends StateMachine {
		case CMD_ENABLE_BACKGROUND_SCAN:
		mEnableBackgroundScan = (message.arg1 == 1);
		if (mEnableBackgroundScan) {
		mWifiNative.enableBackgroundScan(true);
		if (!mWifiNative.enableBackgroundScan(true)) {
		setScanAlarm(true);
		} else {
		setScanAlarm(false);
		}
		} else {
		mWifiNative.enableBackgroundScan(false);
		setScanAlarm(true);
		@@ -3976,7 +3983,11 @@ public class WifiStateMachine extends StateMachine {
		case WifiMonitor.SCAN_RESULTS_EVENT:
		/* Re-enable background scan when a pending scan result is received */
		if (mEnableBackgroundScan && mScanResultIsPending) {
		mWifiNative.enableBackgroundScan(true);
		if (!mWifiNative.enableBackgroundScan(true)) {
		setScanAlarm(true);
		} else {
		setScanAlarm(false);
		}
		}
		/* Handled in parent state */
		ret = NOT_HANDLED;