LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fail fast if somebody is adding default routes"

Browse Source 
This reverts commit 24efb41874

Mako wouldn't boot for me, reverting for now.

Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7
This commit is contained in:
Wink Saville
2013-03-15 05:07:04 +00:00
committed by Android (Google) Code Review
parent 24efb41874
commit 93c1d17a1a
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/ConnectivityService.java
View File

@@ -2306,20 +2306,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
boolean routesChanged = (routeDiff.removed.size() != 0 || routeDiff.added.size() != 0); 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) { for (RouteInfo r : routeDiff.removed) {
if (isLinkDefault || ! r.isDefaultRoute()) { if (isLinkDefault || ! r.isDefaultRoute()) {
removeRoute(curLp, r, TO_DEFAULT_TABLE); removeRoute(curLp, r, TO_DEFAULT_TABLE);