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

Commit 558da330 authored by Aaron Huang's avatar Aaron Huang
Browse files

Remove IBatteryStats from ConnectivityService module 

Currently ConnectivityService calls the methods in
BatteryStatsService through BatteryStatsManager so
IBatteryStats can be removed from ConnectivityService.

Bug: 171686421
Test: FrameworksNetTests
Change-Id: I559369c9900e8100cdae187bc9cec603ed85a131
parent 687da317

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

+0 −6
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ import com.android.connectivity.aidl.INetworkAgent; 
import com.android.internal.R;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.IBatteryStats;

import com.android.internal.util.AsyncChannel;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.LocationPermissionChecker;
@@ -201,7 +200,6 @@ import com.android.net.module.util.LinkPropertiesUtils.CompareOrUpdateResult; 
import com.android.net.module.util.LinkPropertiesUtils.CompareResult;

import com.android.net.module.util.NetworkCapabilitiesUtils;

import com.android.net.module.util.PermissionUtils;

import com.android.server.am.BatteryStatsService;

import com.android.server.connectivity.AutodestructReference;

import com.android.server.connectivity.DnsManager;

import com.android.server.connectivity.DnsManager.PrivateDnsValidationUpdate;
@@ -1035,10 +1033,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            return new MultinetworkPolicyTracker(c, h, r);

        }



        public IBatteryStats getBatteryStatsService() {

            return BatteryStatsService.getService();

        }



        /**

         * @see BatteryStatsManager

         */

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

+0 −6
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;













import com.android.internal.app.IBatteryStats;















import com.android.internal.net.VpnConfig;















import com.android.internal.net.VpnProfile;















import com.android.internal.util.ArrayUtils;










@@ -427,7 +426,6 @@ public class ConnectivityServiceTest {













    @Mock DeviceIdleInternal mDeviceIdleInternal;















    @Mock INetworkManagementService mNetworkManagementService;















    @Mock NetworkStatsManager mStatsManager;













    @Mock IBatteryStats mBatteryStatsService;















    @Mock IDnsResolver mMockDnsResolver;















    @Mock INetd mMockNetd;















    @Mock NetworkStackClient mNetworkStack;










@@ -1526,7 +1524,6 @@ public class ConnectivityServiceTest {













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















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















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













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















        doAnswer(inv -> {















            mPolicyTracker = new WrappedMultinetworkPolicyTracker(















                    inv.getArgument(0), inv.getArgument(1), inv.getArgument(2));










@@ -7811,7 +7808,6 @@ public class ConnectivityServiceTest {













        verify(mDeps).reportNetworkInterfaceForTransports(mServiceContext,















                cellLp.getInterfaceName(),















                new int[] { TRANSPORT_CELLULAR });













        reset(mBatteryStatsService);





























        final LinkProperties wifiLp = new LinkProperties();















        wifiLp.setInterfaceName("wifi0");









@@ -7821,7 +7817,6 @@ public class ConnectivityServiceTest {













        verify(mDeps).reportNetworkInterfaceForTransports(mServiceContext,















                wifiLp.getInterfaceName(),















                new int[] { TRANSPORT_WIFI });













        reset(mBatteryStatsService);





























        mCellNetworkAgent.disconnect();















        mWiFiNetworkAgent.disconnect();










@@ -7904,7 +7899,6 @@ public class ConnectivityServiceTest {













        mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR, cellLp);















        reset(mMockDnsResolver);















        reset(mMockNetd);













        reset(mBatteryStatsService);





























        // Connect with ipv6 link properties. Expect prefix discovery to be started.















        mCellNetworkAgent.connect(true);