Merge "[SP27.3] Rename TestableNetworkStatsProvider" into rvc-dev

This commit is contained in:
Junyu Lai 2020-04-15 10:44:23 +00:00 • committed by Android (Google) Code Review
commit 6d1c9246fb

View file

@ -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);