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

Commit a8e9090c authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Fix testRegisterUsageCallback failure in setUp 

LocalServices.addService in NetworkStatsService is currently failing
with IllegalStateException "Overriding service registration". Setting up
LocalServices in the test to avoid this issue might be possible, but
moving the registration to the only non-test caller of that constructor
as done here solves the issue and avoids side-effects from a constructor.

Test: atest FrameworksNetTests does not choke on this test
Bug: b/78487385
Bug: b/80082746
Change-Id: I5dba98fc79aec0800c8b71e6c7e23d1cfbcae852
Merged-In: I884a7a8bd7db3fcd220b785ba9914ac8c77720f0
(Clean cherry-pick of go/ag/4061255)
parent bf668472

services/core/java/com/android/server/net/NetworkStatsService.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -324,6 +324,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
                wakeLock, getDefaultClock(), TelephonyManager.getDefault(),

                wakeLock, getDefaultClock(), TelephonyManager.getDefault(),

                new DefaultNetworkStatsSettings(context), new NetworkStatsObservers(),

                new DefaultNetworkStatsSettings(context), new NetworkStatsObservers(),

                getDefaultSystemDir(), getDefaultBaseDir());

                getDefaultSystemDir(), getDefaultBaseDir());

        service.registerLocalService();





        HandlerThread handlerThread = new HandlerThread(TAG);

        HandlerThread handlerThread = new HandlerThread(TAG);

        Handler.Callback callback = new HandlerCallback(service);

        Handler.Callback callback = new HandlerCallback(service);
@@ -333,6 +334,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        return service;

        return service;

    }

    }





    // This must not be called outside of tests, even within the same package, as this constructor

    // does not register the local service. Use the create() helper above.

    @VisibleForTesting

    @VisibleForTesting

    NetworkStatsService(Context context, INetworkManagementService networkManager,

    NetworkStatsService(Context context, INetworkManagementService networkManager,

            AlarmManager alarmManager, PowerManager.WakeLock wakeLock, Clock clock,

            AlarmManager alarmManager, PowerManager.WakeLock wakeLock, Clock clock,
@@ -349,7 +352,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        mSystemDir = checkNotNull(systemDir, "missing systemDir");

        mSystemDir = checkNotNull(systemDir, "missing systemDir");

        mBaseDir = checkNotNull(baseDir, "missing baseDir");

        mBaseDir = checkNotNull(baseDir, "missing baseDir");

        mUseBpfTrafficStats = new File("/sys/fs/bpf/traffic_uid_stats_map").exists();

        mUseBpfTrafficStats = new File("/sys/fs/bpf/traffic_uid_stats_map").exists();

    }





    private void registerLocalService() {

        LocalServices.addService(NetworkStatsManagerInternal.class,

        LocalServices.addService(NetworkStatsManagerInternal.class,

                new NetworkStatsManagerInternalImpl());

                new NetworkStatsManagerInternalImpl());

    }

    }

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -227,9 +227,6 @@ public class NetworkStatsServiceTest { 




    @After

    @After

    public void tearDown() throws Exception {

    public void tearDown() throws Exception {

        // Registered by NetworkStatsService's constructor.

        LocalServices.removeServiceForTest(NetworkStatsManagerInternal.class);



        IoUtils.deleteContents(mStatsDir);

        IoUtils.deleteContents(mStatsDir);





        mServiceContext = null;

        mServiceContext = null;