Merge "Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev am:... (2674aa10) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ import com.android.internal.util.test.BroadcastInterceptingContext;
		import com.android.server.net.NetworkStatsService.NetworkStatsSettings;
		import com.android.server.net.NetworkStatsService.NetworkStatsSettings.Config;
		import com.android.testutils.HandlerUtilsKt;
		import com.android.testutils.TestableNetworkStatsProvider;
		import com.android.testutils.TestableNetworkStatsProviderBinder;

		import libcore.io.IoUtils;

		@@ -1118,7 +1118,8 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
		expectNetworkStatsUidDetail(buildEmptyStats());

		// Register custom provider and retrieve callback.
		final TestableNetworkStatsProvider provider = new TestableNetworkStatsProvider();
		final TestableNetworkStatsProviderBinder provider =
		new TestableNetworkStatsProviderBinder();
		final INetworkStatsProviderCallback cb =
		mService.registerNetworkStatsProvider("TEST", provider);
		assertNotNull(cb);
		@@ -1176,7 +1177,8 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
		mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);

		// Register custom provider and retrieve callback.
		final TestableNetworkStatsProvider provider = new TestableNetworkStatsProvider();
		final TestableNetworkStatsProviderBinder provider =
		new TestableNetworkStatsProviderBinder();
		final INetworkStatsProviderCallback cb =
		mService.registerNetworkStatsProvider("TEST", provider);
		assertNotNull(cb);