am 3e229076: am cc4b4016: Fix the reporting of NO_CONNECTIVITY. (fbf56dc7) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ConnectivityService.java

+20 −13

Original line number	Diff line number	Diff line
		@@ -828,13 +828,16 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		info.getExtraInfo());
		}

		NetworkStateTracker newNet = tryFailover(prevNetType);
		NetworkStateTracker newNet = null;
		if (mNetAttributes[prevNetType].isDefault()) {
		newNet = tryFailover(prevNetType);
		if (newNet != null) {
		NetworkInfo switchTo = newNet.getNetworkInfo();
		intent.putExtra(ConnectivityManager.EXTRA_OTHER_NETWORK_INFO, switchTo);
		} else {
		intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true);
		}
		}
		// do this before we broadcast the change
		handleConnectivityChange();

		@@ -848,7 +851,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}
		}

		// returns -1 if no failover available
		// returns null if no failover available
		private NetworkStateTracker tryFailover(int prevNetType) {
		/*
		* If this is a default network, check if other defaults are available
		@@ -970,13 +973,17 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		info.setFailover(false);
		}

		NetworkStateTracker newNet = tryFailover(info.getType());
		NetworkStateTracker newNet = null;
		if (mNetAttributes[info.getType()].isDefault()) {
		newNet = tryFailover(info.getType());
		if (newNet != null) {
		NetworkInfo switchTo = newNet.getNetworkInfo();
		intent.putExtra(ConnectivityManager.EXTRA_OTHER_NETWORK_INFO, switchTo);
		} else {
		intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true);
		}
		}

		// do this before we broadcast the change
		handleConnectivityChange();