am 5635dc93: am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 (15cb32ed) · Commits · e / os / android_frameworks_base

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

+13 −8

Original line number	Diff line number	Diff line
		@@ -1409,13 +1409,16 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		if (TextUtils.isEmpty(interfaceName)) return;
		for (InetAddress gateway : p.getGateways()) {

		if (!NetworkUtils.addDefaultRoute(interfaceName, gateway) && DBG) {
		if (NetworkUtils.addHostRoute(interfaceName, gateway, null) &&
		NetworkUtils.addDefaultRoute(interfaceName, gateway)) {
		if (DBG) {
		NetworkInfo networkInfo = nt.getNetworkInfo();
		log("addDefaultRoute for " + networkInfo.getTypeName() +
		" (" + interfaceName + "), GatewayAddr=" + gateway.getHostAddress());
		}
		}
		}
		}


		public void removeDefaultRoute(NetworkStateTracker nt) {
		@@ -1424,13 +1427,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		String interfaceName = p.getInterfaceName();

		if (interfaceName != null) {
		if ((NetworkUtils.removeDefaultRoute(interfaceName) >= 0) && DBG) {
		if (NetworkUtils.removeDefaultRoute(interfaceName) >= 0) {
		if (DBG) {
		NetworkInfo networkInfo = nt.getNetworkInfo();
		log("removeDefaultRoute for " + networkInfo.getTypeName() + " (" +
		interfaceName + ")");
		}
		}
		}
		}

		/**
		* Reads the network specific TCP buffer sizes from SystemProperties