From d5c2d07daba309c00cd273ae084d6feb66152dfd Mon Sep 17 00:00:00 2001 From: lucaslin Date: Sat, 20 Feb 2021 18:59:47 +0800 Subject: [PATCH] Remove unused INetworkManagementService Bug: 174837473 Test: atest FrameworksNetTests Change-Id: I4e4f929f518ae07bf5b4bd1e16d2a85f62ab9d9c --- .../java/com/android/server/ConnectivityService.java | 10 +++++----- .../com/android/server/connectivity/Nat464Xlat.java | 6 +----- .../server/connectivity/NetworkAgentInfo.java | 7 +++---- .../com/android/server/ConnectivityServiceTest.java | 4 ++-- .../server/connectivity/LingerMonitorTest.java | 6 ++---- .../android/server/connectivity/Nat464XlatTest.java | 12 +++++------- 6 files changed, 18 insertions(+), 27 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index c67379dd6f..d5bb108df4 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -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 { @@ -1236,12 +1236,12 @@ public class ConnectivityService extends IConnectivityManager.Stub mDnsManager = new DnsManager(mContext, mDnsResolver); registerPrivateDnsSettingsCallbacks(); - mNoServiceNetwork = new NetworkAgentInfo(null, + mNoServiceNetwork = new NetworkAgentInfo(null, new Network(NO_SERVICE_NET_ID), 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; diff --git a/services/core/java/com/android/server/connectivity/Nat464Xlat.java b/services/core/java/com/android/server/connectivity/Nat464Xlat.java index 6052a12bdf..fa80b25f90 100644 --- a/services/core/java/com/android/server/connectivity/Nat464Xlat.java +++ b/services/core/java/com/android/server/connectivity/Nat464Xlat.java @@ -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; } diff --git a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java index 4cf527415d..cac6cab707 100644 --- a/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java +++ b/services/core/java/com/android/server/connectivity/NetworkAgentInfo.java @@ -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 { 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 { 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; diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index fbeebe53fe..975f55286d 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -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 diff --git a/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java b/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java index 52cb836e19..a913673c2a 100644 --- a/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java @@ -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; } diff --git a/tests/net/java/com/android/server/connectivity/Nat464XlatTest.java b/tests/net/java/com/android/server/connectivity/Nat464XlatTest.java index 068de4777e..5f56e25356 100644 --- a/tests/net/java/com/android/server/connectivity/Nat464XlatTest.java +++ b/tests/net/java/com/android/server/connectivity/Nat464XlatTest.java @@ -36,7 +36,6 @@ import android.net.LinkProperties; import android.net.NetworkAgentConfig; import android.net.NetworkInfo; import android.os.Handler; -import android.os.INetworkManagementService; import android.os.test.TestLooper; import androidx.test.filters.SmallTest; @@ -67,7 +66,6 @@ public class Nat464XlatTest { @Mock ConnectivityService mConnectivity; @Mock IDnsResolver mDnsResolver; @Mock INetd mNetd; - @Mock INetworkManagementService mNms; @Mock NetworkAgentInfo mNai; TestLooper mLooper; @@ -75,7 +73,7 @@ public class Nat464XlatTest { NetworkAgentConfig mAgentConfig = new NetworkAgentConfig(); Nat464Xlat makeNat464Xlat() { - return new Nat464Xlat(mNai, mNetd, mDnsResolver, mNms) { + return new Nat464Xlat(mNai, mNetd, mDnsResolver) { @Override protected int getNetId() { return NETID; } @@ -233,7 +231,7 @@ public class Nat464XlatTest { nat.interfaceRemoved(STACKED_IFACE); mLooper.dispatchNext(); - verifyNoMoreInteractions(mNetd, mNms, mConnectivity); + verifyNoMoreInteractions(mNetd, mConnectivity); } @Test @@ -370,7 +368,7 @@ public class Nat464XlatTest { // ConnectivityService stops clat: no-op. nat.stop(); - verifyNoMoreInteractions(mNetd, mNms, mConnectivity); + verifyNoMoreInteractions(mNetd, mConnectivity); } private void checkStopBeforeClatdStarts(boolean dueToDisconnect) throws Exception { @@ -402,7 +400,7 @@ public class Nat464XlatTest { assertIdle(nat); - verifyNoMoreInteractions(mNetd, mNms, mConnectivity); + verifyNoMoreInteractions(mNetd, mConnectivity); } @Test @@ -434,7 +432,7 @@ public class Nat464XlatTest { verify(mDnsResolver).stopPrefix64Discovery(eq(NETID)); assertIdle(nat); - verifyNoMoreInteractions(mNetd, mNms, mConnectivity); + verifyNoMoreInteractions(mNetd, mConnectivity); } @Test