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

Commit 1f110f67 authored by lucaslin's avatar lucaslin
Browse files

Remove unused INetworkManagementService 

Bug: 174837473
Test: atest FrameworksNetTests
Change-Id: I4e4f929f518ae07bf5b4bd1e16d2a85f62ab9d9c
parent b5b65cf4

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

+5 −5
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        mUserAllContext.registerReceiver(mIntentReceiver, intentFilter,

                null /* broadcastPermission */, mHandler);



        mNetworkActivityTracker = new LegacyNetworkActivityTracker(mContext, mHandler, mNMS, mNetd);

        mNetworkActivityTracker = new LegacyNetworkActivityTracker(mContext, mHandler, mNetd);



        mNetdCallback = new NetdCallback();

        try {
@@ -1241,7 +1241,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                new NetworkInfo(TYPE_NONE, 0, "", ""),

                new LinkProperties(), new NetworkCapabilities(), 0, mContext,

                null, new NetworkAgentConfig(), this, null,

                null, null, 0, INVALID_UID,

                null, 0, INVALID_UID,

                mQosCallbackTracker);

    }
@@ -6027,7 +6027,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        final NetworkAgentInfo nai = new NetworkAgentInfo(na,

                new Network(mNetIdManager.reserveNetId()), new NetworkInfo(networkInfo), lp, nc,

                currentScore, mContext, mTrackerHandler, new NetworkAgentConfig(networkAgentConfig),

                this, mNetd, mDnsResolver, mNMS, providerId, uid, mQosCallbackTracker);

                this, mNetd, mDnsResolver, providerId, uid, mQosCallbackTracker);



        // Make sure the LinkProperties and NetworkCapabilities reflect what the agent info says.

        processCapabilitiesFromAgent(nai, nc);
@@ -8708,7 +8708,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }



        LegacyNetworkActivityTracker(@NonNull Context context, @NonNull Handler handler,

                @NonNull INetworkManagementService nms, @NonNull INetd netd) {

                @NonNull INetd netd) {

            mContext = context;

            mNetd = netd;

            mHandler = handler;

services/core/java/com/android/server/connectivity/Nat464Xlat.java

+1 −5
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.net.LinkAddress; 
import android.net.LinkProperties;

import android.net.NetworkInfo;

import android.net.RouteInfo;

import android.os.INetworkManagementService;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.util.Log;
@@ -69,7 +68,6 @@ public class Nat464Xlat { 


    private final IDnsResolver mDnsResolver;

    private final INetd mNetd;

    private final INetworkManagementService mNMService;



    // The network we're running on, and its type.

    private final NetworkAgentInfo mNetwork;
@@ -98,11 +96,9 @@ public class Nat464Xlat { 


    private boolean mPrefixDiscoveryRunning;



    public Nat464Xlat(NetworkAgentInfo nai, INetd netd, IDnsResolver dnsResolver,

            INetworkManagementService nmService) {

    public Nat464Xlat(NetworkAgentInfo nai, INetd netd, IDnsResolver dnsResolver) {

        mDnsResolver = dnsResolver;

        mNetd = netd;

        mNMService = nmService;

        mNetwork = nai;

    }

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+3 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.net.QosSession; 
import android.net.TcpKeepalivePacketData;

import android.os.Handler;

import android.os.IBinder;

import android.os.INetworkManagementService;

import android.os.RemoteException;

import android.os.SystemClock;

import android.telephony.data.EpsBearerQosSessionAttributes;
@@ -341,8 +340,8 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
    public NetworkAgentInfo(INetworkAgent na, Network net, NetworkInfo info,

            @NonNull LinkProperties lp, @NonNull NetworkCapabilities nc, int score, Context context,

            Handler handler, NetworkAgentConfig config, ConnectivityService connService, INetd netd,

            IDnsResolver dnsResolver, INetworkManagementService nms, int factorySerialNumber,

            int creatorUid, QosCallbackTracker qosCallbackTracker) {

            IDnsResolver dnsResolver, int factorySerialNumber, int creatorUid,

            QosCallbackTracker qosCallbackTracker) {

        Objects.requireNonNull(net);

        Objects.requireNonNull(info);

        Objects.requireNonNull(lp);
@@ -356,7 +355,7 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
        linkProperties = lp;

        networkCapabilities = nc;

        mScore = score;

        clatd = new Nat464Xlat(this, netd, dnsResolver, nms);

        clatd = new Nat464Xlat(this, netd, dnsResolver);

        mConnService = connService;

        mContext = context;

        mHandler = handler;

tests/net/java/com/android/server/ConnectivityServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -8926,8 +8926,8 @@ public class ConnectivityServiceTest { 
                ConnectivityManager.getNetworkTypeName(TYPE_MOBILE),

                TelephonyManager.getNetworkTypeName(TelephonyManager.NETWORK_TYPE_LTE));

        return new NetworkAgentInfo(null, new Network(NET_ID), info, new LinkProperties(),

                nc, 0, mServiceContext, null, new NetworkAgentConfig(), mService, null, null, null,

                0, INVALID_UID, mQosCallbackTracker);

                nc, 0, mServiceContext, null, new NetworkAgentConfig(), mService, null, null, 0,

                INVALID_UID, mQosCallbackTracker);

    }















    @Test

































tests/net/java/com/android/server/connectivity/LingerMonitorTest.java



+2
−4




























Original line number
Diff line number
Diff line








@@ -41,7 +41,6 @@ import android.net.NetworkCapabilities;













import android.net.NetworkInfo;















import android.net.NetworkProvider;















import android.os.Binder;













import android.os.INetworkManagementService;















import android.text.format.DateUtils;































import androidx.test.filters.SmallTest;










@@ -74,7 +73,6 @@ public class LingerMonitorTest {













    @Mock ConnectivityService mConnService;















    @Mock IDnsResolver mDnsResolver;















    @Mock INetd mNetd;













    @Mock INetworkManagementService mNMS;















    @Mock Context mCtx;















    @Mock NetworkNotificationManager mNotifier;















    @Mock Resources mResources;










@@ -358,8 +356,8 @@ public class LingerMonitorTest {













        caps.addTransportType(transport);















        NetworkAgentInfo nai = new NetworkAgentInfo(null, new Network(netId), info,















                new LinkProperties(), caps, 50, mCtx, null, new NetworkAgentConfig() /* config */,













                mConnService, mNetd, mDnsResolver, mNMS, NetworkProvider.ID_NONE,













                Binder.getCallingUid(), mQosCallbackTracker);













                mConnService, mNetd, mDnsResolver, NetworkProvider.ID_NONE, Binder.getCallingUid(),













                mQosCallbackTracker);















        nai.everValidated = true;















        return nai;















    }