From 706d7ab8f9acecfdf0c3117a077cd1c32c048b9f Mon Sep 17 00:00:00 2001 From: Luke Huang Date: Tue, 16 Oct 2018 15:42:15 +0800 Subject: [PATCH] Refine network-related commands porting Test: runtest frameworks-net passes Test: manual testing of network related function works Change-Id: Ica4685fee30308f3494d4afa02b673ba29876be0 --- .../java/com/android/server/NetworkManagementService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index ab5005927c4e0..26f2427682f8a 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -2548,18 +2548,18 @@ public class NetworkManagementService extends INetworkManagementService.Stub @Override public void addInterfaceToLocalNetwork(String iface, List routes) { - modifyInterfaceInNetwork(MODIFY_OPERATION_ADD, INetd.NETID_LOCAL, iface); + modifyInterfaceInNetwork(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID, iface); for (RouteInfo route : routes) { if (!route.isDefaultRoute()) { - modifyRoute(MODIFY_OPERATION_ADD, INetd.NETID_LOCAL, route); + modifyRoute(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID, route); } } } @Override public void removeInterfaceFromLocalNetwork(String iface) { - modifyInterfaceInNetwork(MODIFY_OPERATION_REMOVE, INetd.NETID_LOCAL, iface); + modifyInterfaceInNetwork(MODIFY_OPERATION_REMOVE, INetd.LOCAL_NET_ID, iface); } @Override @@ -2568,7 +2568,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub for (RouteInfo route : routes) { try { - modifyRoute(MODIFY_OPERATION_REMOVE, INetd.NETID_LOCAL, route); + modifyRoute(MODIFY_OPERATION_REMOVE, INetd.LOCAL_NET_ID, route); } catch (IllegalStateException e) { failures++; }