From 7b5fd05d4e41c91386974970e3da5dcbfc2b2132 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 6f210bd0191e1936bbc1f036912c6efc4ea69475 Mako wouldn't boot for me, reverting for now. Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7 --- .../com/android/server/ConnectivityService.java | 14 -------------- .../android/server/NetworkManagementService.java | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 5ed23cfdc0e2d..c83a919efa60d 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); diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index 8d3127136208c..768670575baa7 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -711,7 +711,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub InetAddress gatewayAddr = NetworkUtils.intToInetAddress((int)Long.parseLong(gate, 16)); - RouteInfo route = new RouteInfo(linkAddress, gatewayAddr, iface); + RouteInfo route = new RouteInfo(linkAddress, gatewayAddr); routes.add(route); } catch (Exception e) { Log.e(TAG, "Error parsing route " + s + " : " + e); @@ -743,7 +743,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub InetAddress gateAddr = NetworkUtils.hexToInet6Address(gate); - RouteInfo route = new RouteInfo(linkAddress, gateAddr, iface); + RouteInfo route = new RouteInfo(linkAddress, gateAddr); routes.add(route); } catch (Exception e) { Log.e(TAG, "Error parsing route " + s + " : " + e);