LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove IBatteryStats from ConnectivityService module"

Browse Source
This commit is contained in:
Aaron Huang
2021-03-11 02:04:41 +00:00
committed by Gerrit Code Review
parent 8bf00e241f 2aac0cd79d
commit a0d00e1964
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -189,7 +189,6 @@ import com.android.connectivity.aidl.INetworkAgent;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IBatteryStats;
import com.android.internal.util.AsyncChannel; import com.android.internal.util.AsyncChannel;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.LocationPermissionChecker; 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.LinkPropertiesUtils.CompareResult;
import com.android.net.module.util.NetworkCapabilitiesUtils; import com.android.net.module.util.NetworkCapabilitiesUtils;
import com.android.net.module.util.PermissionUtils; import com.android.net.module.util.PermissionUtils;
import com.android.server.am.BatteryStatsService;
import com.android.server.connectivity.AutodestructReference; import com.android.server.connectivity.AutodestructReference;
import com.android.server.connectivity.DnsManager; import com.android.server.connectivity.DnsManager;
import com.android.server.connectivity.DnsManager.PrivateDnsValidationUpdate; import com.android.server.connectivity.DnsManager.PrivateDnsValidationUpdate;
@@ -1066,10 +1064,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
return new MultinetworkPolicyTracker(c, h, r); return new MultinetworkPolicyTracker(c, h, r);
} }
public IBatteryStats getBatteryStatsService() {
return BatteryStatsService.getService();
}
/** /**
* @see BatteryStatsManager * @see BatteryStatsManager
*/ */

6
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -266,7 +266,6 @@ import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.internal.app.IBatteryStats;
import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
@@ -428,7 +427,6 @@ public class ConnectivityServiceTest {
@Mock DeviceIdleInternal mDeviceIdleInternal; @Mock DeviceIdleInternal mDeviceIdleInternal;
@Mock INetworkManagementService mNetworkManagementService; @Mock INetworkManagementService mNetworkManagementService;
@Mock NetworkStatsManager mStatsManager; @Mock NetworkStatsManager mStatsManager;
@Mock IBatteryStats mBatteryStatsService;
@Mock IDnsResolver mMockDnsResolver; @Mock IDnsResolver mMockDnsResolver;
@Mock INetd mMockNetd; @Mock INetd mMockNetd;
@Mock NetworkStackClient mNetworkStack; @Mock NetworkStackClient mNetworkStack;
@@ -1527,7 +1525,6 @@ public class ConnectivityServiceTest {
doReturn(mSystemProperties).when(deps).getSystemProperties(); doReturn(mSystemProperties).when(deps).getSystemProperties();
doReturn(mock(ProxyTracker.class)).when(deps).makeProxyTracker(any(), any()); doReturn(mock(ProxyTracker.class)).when(deps).makeProxyTracker(any(), any());
doReturn(true).when(deps).queryUserAccess(anyInt(), anyInt()); doReturn(true).when(deps).queryUserAccess(anyInt(), anyInt());
doReturn(mBatteryStatsService).when(deps).getBatteryStatsService();
doAnswer(inv -> { doAnswer(inv -> {
mPolicyTracker = new WrappedMultinetworkPolicyTracker( mPolicyTracker = new WrappedMultinetworkPolicyTracker(
inv.getArgument(0), inv.getArgument(1), inv.getArgument(2)); inv.getArgument(0), inv.getArgument(1), inv.getArgument(2));
@@ -7812,7 +7809,6 @@ public class ConnectivityServiceTest {
verify(mDeps).reportNetworkInterfaceForTransports(mServiceContext, verify(mDeps).reportNetworkInterfaceForTransports(mServiceContext,
cellLp.getInterfaceName(), cellLp.getInterfaceName(),
new int[] { TRANSPORT_CELLULAR }); new int[] { TRANSPORT_CELLULAR });
reset(mBatteryStatsService);
final LinkProperties wifiLp = new LinkProperties(); final LinkProperties wifiLp = new LinkProperties();
wifiLp.setInterfaceName("wifi0"); wifiLp.setInterfaceName("wifi0");
@@ -7822,7 +7818,6 @@ public class ConnectivityServiceTest {
verify(mDeps).reportNetworkInterfaceForTransports(mServiceContext, verify(mDeps).reportNetworkInterfaceForTransports(mServiceContext,
wifiLp.getInterfaceName(), wifiLp.getInterfaceName(),
new int[] { TRANSPORT_WIFI }); new int[] { TRANSPORT_WIFI });
reset(mBatteryStatsService);
mCellNetworkAgent.disconnect(); mCellNetworkAgent.disconnect();
mWiFiNetworkAgent.disconnect(); mWiFiNetworkAgent.disconnect();
@@ -7905,7 +7900,6 @@ public class ConnectivityServiceTest {
mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR, cellLp); mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR, cellLp);
reset(mMockDnsResolver); reset(mMockDnsResolver);
reset(mMockNetd); reset(mMockNetd);
reset(mBatteryStatsService);
// Connect with ipv6 link properties. Expect prefix discovery to be started. // Connect with ipv6 link properties. Expect prefix discovery to be started.
mCellNetworkAgent.connect(true); mCellNetworkAgent.connect(true);