Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fail fast if somebody is adding default routes"

Browse Source 
This reverts commit 6f210bd019

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 6f210bd019
commit 7b5fd05d4e
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/NetworkManagementService.java
View File

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