Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5e9cba authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use static utils from f/l/n instead of the networkstack" am: 1b05dfe0... 

Merge "Use static utils from f/l/n instead of the networkstack" am: 1b05dfe0 am: a2e71597 am: be2b59b8 am: 8289d043 am: 5ea0e648

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

Change-Id: I85a1a684e9ad27723597e6b85e7302516ed52e33
parents c568eb88 5ea0e648

services/core/java/com/android/server/NetworkManagementService.java

+6 −7
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ import android.net.NetworkStats; 
import android.net.RouteInfo;

import android.net.TetherStatsParcel;

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.os.BatteryStats;

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.HexDump;

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;
@@ -831,13 +830,13 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
    @Override

    public void addRoute(int netId, RouteInfo route) {

        NetworkStack.checkNetworkStackPermission(mContext);

        RouteUtils.modifyRoute(mNetdService, ModifyOperation.ADD, netId, route);

        NetdUtils.modifyRoute(mNetdService, ModifyOperation.ADD, netId, route);

    }



    @Override

    public void removeRoute(int netId, RouteInfo route) {

        NetworkStack.checkNetworkStackPermission(mContext);

        RouteUtils.modifyRoute(mNetdService, ModifyOperation.REMOVE, netId, route);

        NetdUtils.modifyRoute(mNetdService, ModifyOperation.REMOVE, netId, route);

    }



    private ArrayList<String> readRouteList(String filename) {
@@ -1785,7 +1784,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
    public void addInterfaceToLocalNetwork(String iface, List<RouteInfo> routes) {

        modifyInterfaceInNetwork(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID, iface);

        // modifyInterfaceInNetwork already check calling permission.

        RouteUtils.addRoutesToLocalNetwork(mNetdService, iface, routes);

        NetdUtils.addRoutesToLocalNetwork(mNetdService, iface, routes);

    }



    @Override
@@ -1796,7 +1795,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
    @Override

    public int removeRoutesFromLocalNetwork(List<RouteInfo> routes) {

        NetworkStack.checkNetworkStackPermission(mContext);

        return RouteUtils.removeRoutesFromLocalNetwork(mNetdService, routes);

        return NetdUtils.removeRoutesFromLocalNetwork(mNetdService, routes);

    }



    @Override