From 93c1d17a1a90aff8b5e7cfb9ac046cac6cff2590 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Fri, 15 Mar 2013 05:07:04 +0000 Subject: [PATCH] Revert "Fail fast if somebody is adding default routes" This reverts commit 24efb41874f8c9773f65511a23190b4e933502b5 Mako wouldn't boot for me, reverting for now. Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7 --- .../com/android/server/ConnectivityService.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 5ed23cfdc0..c83a919efa 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -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);