Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage"... (aada49a3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Tethering.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -1008,10 +1008,9 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
		return false;
		}

		protected boolean requestUpstreamMobileConnection() {
		protected void requestUpstreamMobileConnection() {
		mUpstreamNetworkMonitor.updateMobileRequiresDun(mConfig.isDunRequired);
		mUpstreamNetworkMonitor.registerMobileNetworkRequest();
		return true;
		}

		protected void unrequestUpstreamMobileConnection() {
		@@ -1100,7 +1099,8 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
		requestUpstreamMobileConnection();
		break;
		case ConnectivityManager.TYPE_NONE:
		if (tryCell && requestUpstreamMobileConnection()) {
		if (tryCell) {
		requestUpstreamMobileConnection();
		// We think mobile should be coming up; don't set a retry.
		} else {
		sendMessageDelayed(CMD_RETRY_UPSTREAM, UPSTREAM_SETTLE_TIME_MS);
		@@ -1354,9 +1354,9 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
		simChange.startListening();
		mUpstreamNetworkMonitor.start();

		mTryCell = true; // better try something first pass or crazy tests cases will fail
		chooseUpstreamType(mTryCell);
		mTryCell = !mTryCell;
		// Better try something first pass or crazy tests cases will fail.
		chooseUpstreamType(true);
		mTryCell = false;
		}

		@Override
		@@ -1407,10 +1407,9 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
		break;
		}
		case CMD_UPSTREAM_CHANGED:
		// need to try DUN immediately if Wifi goes down
		mTryCell = true;
		chooseUpstreamType(mTryCell);
		mTryCell = !mTryCell;
		// Need to try DUN immediately if Wi-Fi goes down.
		chooseUpstreamType(true);
		mTryCell = false;
		break;
		case CMD_RETRY_UPSTREAM:
		chooseUpstreamType(mTryCell);