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

Commit 996c1749 authored by Paul Hu's avatar Paul Hu Committed by Gerrit Code Review
Browse files

Merge "Remove unused IpConnectivityMetrics in CS"

parents 78426b28 6939f419

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

+0 −9
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ import com.android.server.connectivity.AutodestructReference; 
import com.android.server.connectivity.DataConnectionStats;

import com.android.server.connectivity.DnsManager;

import com.android.server.connectivity.DnsManager.PrivateDnsValidationUpdate;

import com.android.server.connectivity.IpConnectivityMetrics;

import com.android.server.connectivity.KeepaliveTracker;

import com.android.server.connectivity.LingerMonitor;

import com.android.server.connectivity.MockableSystemProperties;
@@ -918,14 +917,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            return new MultinetworkPolicyTracker(c, h, r);

        }



        /**

         * @see IpConnectivityMetrics.Logger

         */

        public IpConnectivityMetrics.Logger getMetricsLogger() {

            return Objects.requireNonNull(LocalServices.getService(IpConnectivityMetrics.Logger.class),

                    "no IpConnectivityMetrics service");

        }



        public IBatteryStats getBatteryStatsService() {

            return BatteryStatsService.getService();

        }

tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt

+0 −8
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ import com.android.server.ConnectivityService 
import com.android.server.LocalServices

import com.android.server.NetworkAgentWrapper

import com.android.server.TestNetIdManager

import com.android.server.connectivity.DefaultNetworkMetrics

import com.android.server.connectivity.IpConnectivityMetrics

import com.android.server.connectivity.MockableSystemProperties

import com.android.server.connectivity.ProxyTracker

import com.android.server.net.NetworkPolicyManagerInternal
@@ -92,10 +90,6 @@ class ConnectivityServiceIntegrationTest { 
    private lateinit var netd: INetd

    @Mock

    private lateinit var dnsResolver: IDnsResolver

    @Mock

    private lateinit var metricsLogger: IpConnectivityMetrics.Logger

    @Mock

    private lateinit var defaultMetrics: DefaultNetworkMetrics

    @Spy

    private var context = TestableContext(realContext)
@@ -149,7 +143,6 @@ class ConnectivityServiceIntegrationTest { 
    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)

        doReturn(defaultMetrics).`when`(metricsLogger).defaultNetworkMetrics()

        doNothing().`when`(context).sendStickyBroadcastAsUser(any(), any(), any())



        networkStackClient = TestNetworkStackClient(realContext)
@@ -173,7 +166,6 @@ class ConnectivityServiceIntegrationTest { 
    private fun makeDependencies(): ConnectivityService.Dependencies {

        val deps = spy(ConnectivityService.Dependencies())

        doReturn(networkStackClient).`when`(deps).networkStack

        doReturn(metricsLogger).`when`(deps).metricsLogger

        doReturn(mock(ProxyTracker::class.java)).`when`(deps).makeProxyTracker(any(), any())

        doReturn(mock(MockableSystemProperties::class.java)).`when`(deps).systemProperties

        doReturn(TestNetIdManager()).`when`(deps).makeNetIdManager()

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

+0 −6
Original line number Diff line number Diff line
@@ -243,8 +243,6 @@ import com.android.internal.util.test.BroadcastInterceptingContext; 
import com.android.internal.util.test.FakeSettingsProvider;

import com.android.server.ConnectivityService.ConnectivityDiagnosticsCallbackInfo;

import com.android.server.connectivity.ConnectivityConstants;

import com.android.server.connectivity.DefaultNetworkMetrics;

import com.android.server.connectivity.IpConnectivityMetrics;

import com.android.server.connectivity.MockableSystemProperties;

import com.android.server.connectivity.Nat464Xlat;

import com.android.server.connectivity.NetworkAgentInfo;
@@ -367,8 +365,6 @@ public class ConnectivityServiceTest { 
    private HandlerThread mAlarmManagerThread;

    private TestNetIdManager mNetIdManager;



    @Mock IpConnectivityMetrics.Logger mMetricsService;

    @Mock DefaultNetworkMetrics mDefaultNetworkMetrics;

    @Mock DeviceIdleInternal mDeviceIdleInternal;

    @Mock INetworkManagementService mNetworkManagementService;

    @Mock INetworkStatsService mStatsService;
@@ -1287,7 +1283,6 @@ public class ConnectivityServiceTest { 
        mContext = InstrumentationRegistry.getContext();



        MockitoAnnotations.initMocks(this);

        when(mMetricsService.defaultNetworkMetrics()).thenReturn(mDefaultNetworkMetrics);



        when(mUserManager.getAliveUsers()).thenReturn(

                Arrays.asList(new UserInfo[] {
@@ -1362,7 +1357,6 @@ public class ConnectivityServiceTest { 
        doReturn(mNetworkStack).when(deps).getNetworkStack();

        doReturn(mSystemProperties).when(deps).getSystemProperties();

        doReturn(mock(ProxyTracker.class)).when(deps).makeProxyTracker(any(), any());

        doReturn(mMetricsService).when(deps).getMetricsLogger();

        doReturn(true).when(deps).queryUserAccess(anyInt(), anyInt());

        doReturn(mBatteryStatsService).when(deps).getBatteryStatsService();

        doAnswer(inv -> {