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

Commit 8fe10dee authored by junyulai's avatar junyulai
Browse files

[SP27.3] Rename TestableNetworkStatsProvider 

Currently, TestableNetworkStatsProvider is a subclass of
INetworkStatsProvider. This is not very accurate naming after
API council review feedback since now we have
NetworkStatsProvider as a system api interface.

This is the counter-part change of actual renaming CL in
NetworkStack.

Test: atest FrameworksNetTests TetheringTests
Bug: 150643374
Change-Id: Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7
Merged-In: Ifa8175dc4e2fe2b907ec13b3bd2eca12974f5ea7
(cherry-picked from ag/10976522)
parent 64ccb889

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

+5 −3
Original line number Original line 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;

import com.android.server.net.NetworkStatsService.NetworkStatsSettings.Config;

import com.android.server.net.NetworkStatsService.NetworkStatsSettings.Config;

import com.android.testutils.HandlerUtilsKt;

import com.android.testutils.HandlerUtilsKt;

import com.android.testutils.TestableNetworkStatsProvider;

import com.android.testutils.TestableNetworkStatsProviderBinder;





import libcore.io.IoUtils;

import libcore.io.IoUtils;
@@ -1118,7 +1118,8 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { 
        expectNetworkStatsUidDetail(buildEmptyStats());

        expectNetworkStatsUidDetail(buildEmptyStats());





        // Register custom provider and retrieve callback.

        // Register custom provider and retrieve callback.

        final TestableNetworkStatsProvider provider = new TestableNetworkStatsProvider();

        final TestableNetworkStatsProviderBinder provider =

                new TestableNetworkStatsProviderBinder();

        final INetworkStatsProviderCallback cb =

        final INetworkStatsProviderCallback cb =

                mService.registerNetworkStatsProvider("TEST", provider);

                mService.registerNetworkStatsProvider("TEST", provider);

        assertNotNull(cb);

        assertNotNull(cb);
@@ -1176,7 +1177,8 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest { 
        mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);

        mService.forceUpdateIfaces(NETWORKS_WIFI, states, getActiveIface(states), new VpnInfo[0]);





        // Register custom provider and retrieve callback.

        // Register custom provider and retrieve callback.

        final TestableNetworkStatsProvider provider = new TestableNetworkStatsProvider();

        final TestableNetworkStatsProviderBinder provider =

                new TestableNetworkStatsProviderBinder();

        final INetworkStatsProviderCallback cb =

        final INetworkStatsProviderCallback cb =

                mService.registerNetworkStatsProvider("TEST", provider);

                mService.registerNetworkStatsProvider("TEST", provider);

        assertNotNull(cb);

        assertNotNull(cb);