Revert "Fail fast if somebody is adding default routes" am: 4235ce5640

Original change: undetermined

Change-Id: I0f89f2624033299de09550d622ce10e819190573
This commit is contained in:
Wink Saville
2021-05-31 06:09:52 +00:00
committed by Automerger Merge Worker

View File

@@ -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);