From 1f110f67600da8f0438309f43dd998fe482900de Mon Sep 17 00:00:00 2001 From: lucaslin Date: Sat, 20 Feb 2021 18:59:47 +0800 Subject: Remove unused INetworkManagementService Bug: 174837473 Test: atest FrameworksNetTests Change-Id: I4e4f929f518ae07bf5b4bd1e16d2a85f62ab9d9c --- tests/net/java/com/android/server/ConnectivityServiceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java') diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index fbeebe53fea8..975f55286de9 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 -- cgit v1.2.3 From 7abe20779571d94c82ebc6cef308d2f24cabf88e Mon Sep 17 00:00:00 2001 From: lucaslin Date: Wed, 24 Feb 2021 13:49:42 +0800 Subject: Remove INetworkManagementService from ConnectivityService Remove INetworkManagementService from ConnectivityService and related files. Bug: 174837473 Test: atest FrameworksNetTests FrameworksNetIntegrationTests Change-Id: Ie6cfd77bbd64a8fd7539b0ea7fd15bf970e40c3d --- tests/net/java/com/android/server/ConnectivityServiceTest.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java') diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 975f55286de9..a6dff3b85ff2 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -1463,7 +1463,6 @@ public class ConnectivityServiceTest { mDeps = makeDependencies(); returnRealCallingUid(); mService = new ConnectivityService(mServiceContext, - mNetworkManagementService, mStatsService, mMockDnsResolver, mock(IpConnectivityLog.class), @@ -7855,7 +7854,6 @@ public class ConnectivityServiceTest { cellLp.addRoute(defaultRoute); cellLp.addRoute(ipv6Subnet); mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR, cellLp); - reset(mNetworkManagementService); reset(mMockDnsResolver); reset(mMockNetd); reset(mBatteryStatsService); @@ -7895,7 +7893,6 @@ public class ConnectivityServiceTest { verifyNoMoreInteractions(mMockNetd); verifyNoMoreInteractions(mMockDnsResolver); - reset(mNetworkManagementService); reset(mMockNetd); reset(mMockDnsResolver); when(mMockNetd.interfaceGetCfg(CLAT_PREFIX + MOBILE_IFNAME)) @@ -7995,7 +7992,6 @@ public class ConnectivityServiceTest { verify(mMockNetd, times(1)).networkRemoveInterface(cellNetId, CLAT_PREFIX + MOBILE_IFNAME); verifyNoMoreInteractions(mMockNetd); verifyNoMoreInteractions(mMockDnsResolver); - reset(mNetworkManagementService); reset(mMockNetd); reset(mMockDnsResolver); when(mMockNetd.interfaceGetCfg(CLAT_PREFIX + MOBILE_IFNAME)) @@ -8232,7 +8228,6 @@ public class ConnectivityServiceTest { final LinkProperties cellLp = new LinkProperties(); cellLp.setInterfaceName(MOBILE_IFNAME); mCellNetworkAgent.sendLinkProperties(cellLp); - reset(mNetworkManagementService); mCellNetworkAgent.connect(true); networkCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent); verify(mMockNetd, times(1)).idletimerAddInterface(eq(MOBILE_IFNAME), anyInt(), -- cgit v1.2.3