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

Merge "Use static utils from f/l/n instead of the networkstack" am: 1b05dfe00d am: a2e71597bf am: be2b59b841

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873995

Change-Id: Ic1446a482f4a515d9ac16f76d0b8c3ebf73fe187
This commit is contained in:
Treehugger Robot
2021-11-01 20:06:40 +00:00
committed by Automerger Merge Worker
parent bddf602aca be2b59b841
commit 8289d0432d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,9 +59,6 @@ import android.net.NetworkStats;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.TetherStatsParcel; import android.net.TetherStatsParcel;
import android.net.UidRangeParcel; import android.net.UidRangeParcel;
import android.net.shared.NetdUtils;
import android.net.shared.RouteUtils;
import android.net.shared.RouteUtils.ModifyOperation;
import android.net.util.NetdService; import android.net.util.NetdService;
import android.os.BatteryStats; import android.os.BatteryStats;
import android.os.Binder; import android.os.Binder;
@@ -88,6 +85,8 @@ import com.android.internal.app.IBatteryStats;
import com.android.internal.util.DumpUtils; import com.android.internal.util.DumpUtils;
import com.android.internal.util.HexDump; import com.android.internal.util.HexDump;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import com.android.net.module.util.NetdUtils;
import com.android.net.module.util.NetdUtils.ModifyOperation;
import com.google.android.collect.Maps; import com.google.android.collect.Maps;
@@ -831,13 +830,13 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
@Override @Override
public void addRoute(int netId, RouteInfo route) { public void addRoute(int netId, RouteInfo route) {
NetworkStack.checkNetworkStackPermission(mContext); NetworkStack.checkNetworkStackPermission(mContext);
RouteUtils.modifyRoute(mNetdService, ModifyOperation.ADD, netId, route); NetdUtils.modifyRoute(mNetdService, ModifyOperation.ADD, netId, route);
} }
@Override @Override
public void removeRoute(int netId, RouteInfo route) { public void removeRoute(int netId, RouteInfo route) {
NetworkStack.checkNetworkStackPermission(mContext); NetworkStack.checkNetworkStackPermission(mContext);
RouteUtils.modifyRoute(mNetdService, ModifyOperation.REMOVE, netId, route); NetdUtils.modifyRoute(mNetdService, ModifyOperation.REMOVE, netId, route);
} }
private ArrayList<String> readRouteList(String filename) { private ArrayList<String> readRouteList(String filename) {
@@ -1785,7 +1784,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
public void addInterfaceToLocalNetwork(String iface, List<RouteInfo> routes) { public void addInterfaceToLocalNetwork(String iface, List<RouteInfo> routes) {
modifyInterfaceInNetwork(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID, iface); modifyInterfaceInNetwork(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID, iface);
// modifyInterfaceInNetwork already check calling permission. // modifyInterfaceInNetwork already check calling permission.
RouteUtils.addRoutesToLocalNetwork(mNetdService, iface, routes); NetdUtils.addRoutesToLocalNetwork(mNetdService, iface, routes);
} }
@Override @Override
@@ -1796,7 +1795,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
@Override @Override
public int removeRoutesFromLocalNetwork(List<RouteInfo> routes) { public int removeRoutesFromLocalNetwork(List<RouteInfo> routes) {
NetworkStack.checkNetworkStackPermission(mContext); NetworkStack.checkNetworkStackPermission(mContext);
return RouteUtils.removeRoutesFromLocalNetwork(mNetdService, routes); return NetdUtils.removeRoutesFromLocalNetwork(mNetdService, routes);
} }
@Override @Override