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

Commit a06c417b authored by Aaron Huang's avatar Aaron Huang Committed by Gerrit Code Review
Browse files

Merge "Remove IBatteryStats from ConnectivityService module"

parents 6305e68c 558da330

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;
@@ -1066,10 +1064,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
@@ -266,7 +266,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;










@@ -428,7 +427,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;










@@ -1527,7 +1525,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));










@@ -7812,7 +7809,6 @@ public class ConnectivityServiceTest {













        verify(mDeps).reportNetworkInterfaceForTransports(mServiceContext,















                cellLp.getInterfaceName(),















                new int[] { TRANSPORT_CELLULAR });













        reset(mBatteryStatsService);





























        final LinkProperties wifiLp = new LinkProperties();















        wifiLp.setInterfaceName("wifi0");









@@ -7822,7 +7818,6 @@ public class ConnectivityServiceTest {













        verify(mDeps).reportNetworkInterfaceForTransports(mServiceContext,















                wifiLp.getInterfaceName(),















                new int[] { TRANSPORT_WIFI });













        reset(mBatteryStatsService);





























        mCellNetworkAgent.disconnect();















        mWiFiNetworkAgent.disconnect();










@@ -7905,7 +7900,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);