am 36141361: am 0f316e84: Merge "Remove redundant parameter to modifyRoute" into jb-mr2-dev (8ad30d81) · Commits · e / os / android_frameworks_base

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -1413,11 +1413,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}

		private boolean addRoute(LinkProperties p, RouteInfo r, boolean toDefaultTable) {
		return modifyRoute(p.getInterfaceName(), p, r, 0, ADD, toDefaultTable);
		return modifyRoute(p, r, 0, ADD, toDefaultTable);
		}

		private boolean removeRoute(LinkProperties p, RouteInfo r, boolean toDefaultTable) {
		return modifyRoute(p.getInterfaceName(), p, r, 0, REMOVE, toDefaultTable);
		return modifyRoute(p, r, 0, REMOVE, toDefaultTable);
		}

		private boolean addRouteToAddress(LinkProperties lp, InetAddress addr) {
		@@ -1444,11 +1444,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		bestRoute = RouteInfo.makeHostRoute(addr, bestRoute.getGateway(), iface);
		}
		}
		return modifyRoute(lp.getInterfaceName(), lp, bestRoute, 0, doAdd, toDefaultTable);
		return modifyRoute(lp, bestRoute, 0, doAdd, toDefaultTable);
		}

		private boolean modifyRoute(String ifaceName, LinkProperties lp, RouteInfo r, int cycleCount,
		boolean doAdd, boolean toDefaultTable) {
		private boolean modifyRoute(LinkProperties lp, RouteInfo r, int cycleCount, boolean doAdd,
		boolean toDefaultTable) {
		String ifaceName = lp.getInterfaceName();
		if ((ifaceName == null) \|\| (lp == null) \|\| (r == null)) {
		if (DBG) log("modifyRoute got unexpected null: " + ifaceName + ", " + lp + ", " + r);
		return false;
		@@ -1472,7 +1473,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		bestRoute.getGateway(),
		ifaceName);
		}
		modifyRoute(ifaceName, lp, bestRoute, cycleCount+1, doAdd, toDefaultTable);
		modifyRoute(lp, bestRoute, cycleCount+1, doAdd, toDefaultTable);
		}
		}
		if (doAdd) {