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

Commit 6e9c16f8 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Fix testRegisterUsageCallback failure in setUp" am: c68f5313 

am: a788c681

Change-Id: I5723e356d1b6aa1a71ba693598a5796900fd9ddc
parents 640fa152 a788c681

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;