LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant parameter to modifyRoute

Browse Source 
modifyRoute takes both an interface name and a LinkProperties.
This is redundant because all callers get the interface name
from the LinkProperties. Make modifyRoute get the interface
name from the LinkProperties instead.

Change-Id: I41ba8e0a10241c2f1107204fcaca2be74556042b
This commit is contained in:
Lorenzo Colitti
2013-03-12 07:39:59 +09:00
parent fb47594d3b
commit 53de3366aa
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/ConnectivityService.java
View File

@@ -1413,11 +1413,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
private boolean addRoute(LinkProperties p, RouteInfo r, boolean toDefaultTable) { 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) { 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) { private boolean addRouteToAddress(LinkProperties lp, InetAddress addr) {
@@ -1444,11 +1444,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
bestRoute = RouteInfo.makeHostRoute(addr, bestRoute.getGateway(), iface); 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, private boolean modifyRoute(LinkProperties lp, RouteInfo r, int cycleCount, boolean doAdd,
boolean doAdd, boolean toDefaultTable) { boolean toDefaultTable) {
String ifaceName = lp.getInterfaceName();
if ((ifaceName == null) || (lp == null) || (r == null)) { if ((ifaceName == null) || (lp == null) || (r == null)) {
if (DBG) log("modifyRoute got unexpected null: " + ifaceName + ", " + lp + ", " + r); if (DBG) log("modifyRoute got unexpected null: " + ifaceName + ", " + lp + ", " + r);
return false; return false;
@@ -1472,7 +1473,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
bestRoute.getGateway(), bestRoute.getGateway(),
ifaceName); ifaceName);
} }
modifyRoute(ifaceName, lp, bestRoute, cycleCount+1, doAdd, toDefaultTable); modifyRoute(lp, bestRoute, cycleCount+1, doAdd, toDefaultTable);
} }
} }
if (doAdd) { if (doAdd) {