Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2adea7ff authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Remove redundant parameter to modifyRoute 

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
parent 8c63487f

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) {