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

Merge "Refine network-related commands porting" am: 82696f8e4c

Browse Source 
am: 3c78330edb

Change-Id: Ia99dccc6b705c6e096c559bc04e266393320aa01
This commit is contained in:
Luke Huang
2018-10-24 16:43:55 -07:00
committed by android-build-merger
parent 0f46209cf5 3c78330edb
commit fbe95d1601
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -2548,18 +2548,18 @@ public class NetworkManagementService extends INetworkManagementService.Stub
@Override @Override
public void addInterfaceToLocalNetwork(String iface, List<RouteInfo> routes) { public void addInterfaceToLocalNetwork(String iface, List<RouteInfo> routes) {
modifyInterfaceInNetwork(MODIFY_OPERATION_ADD, INetd.NETID_LOCAL, iface); modifyInterfaceInNetwork(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID, iface);
for (RouteInfo route : routes) { for (RouteInfo route : routes) {
if (!route.isDefaultRoute()) { if (!route.isDefaultRoute()) {
modifyRoute(MODIFY_OPERATION_ADD, INetd.NETID_LOCAL, route); modifyRoute(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID, route);
} }
} }
} }
@Override @Override
public void removeInterfaceFromLocalNetwork(String iface) { public void removeInterfaceFromLocalNetwork(String iface) {
modifyInterfaceInNetwork(MODIFY_OPERATION_REMOVE, INetd.NETID_LOCAL, iface); modifyInterfaceInNetwork(MODIFY_OPERATION_REMOVE, INetd.LOCAL_NET_ID, iface);
} }
@Override @Override
@@ -2568,7 +2568,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
for (RouteInfo route : routes) { for (RouteInfo route : routes) {
try { try {
modifyRoute(MODIFY_OPERATION_REMOVE, INetd.NETID_LOCAL, route); modifyRoute(MODIFY_OPERATION_REMOVE, INetd.LOCAL_NET_ID, route);
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
failures++; failures++;
} }