Revert "Fail fast if somebody is adding default routes"
This reverts commit 24efb41874
Mako wouldn't boot for me, reverting for now.
Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7
This commit is contained in:
committed by
Android (Google) Code Review
parent
24efb41874
commit
93c1d17a1a
@@ -2306,20 +2306,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
||||
|
||||
boolean routesChanged = (routeDiff.removed.size() != 0 || routeDiff.added.size() != 0);
|
||||
|
||||
// look for a radio-added default route (v4-only for now TODO)
|
||||
RouteInfo[] routes = new RouteInfo[0];
|
||||
try {
|
||||
routes = mNetd.getRoutes(newLp.getInterfaceName());
|
||||
} catch (Exception e) {}
|
||||
|
||||
for (RouteInfo route : routes) {
|
||||
if (route.isDefaultRoute() && route.getGateway() instanceof Inet4Address &&
|
||||
mAddedRoutes.contains(route) == false) {
|
||||
throw new IllegalStateException("Unexpected default route found for interface "
|
||||
+ newLp.getInterfaceName());
|
||||
}
|
||||
}
|
||||
|
||||
for (RouteInfo r : routeDiff.removed) {
|
||||
if (isLinkDefault || ! r.isDefaultRoute()) {
|
||||
removeRoute(curLp, r, TO_DEFAULT_TABLE);
|
||||
|
||||
Reference in New Issue
Block a user