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

Commit 234f681d authored by Vova Sharaienko's avatar Vova Sharaienko
Browse files

Fixed AggregatedMobileDataStatsPuller initialization order 

Bug: 328971934
Test: build, flash & run
Change-Id: I0fe7cabc2fe23cddd2cc25b497ce52dfcb864621
parent 789423c3

services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.stats.pull;



import android.annotation.NonNull;

import android.app.ActivityManager;

import android.app.StatsManager;

import android.app.usage.NetworkStatsManager;
@@ -135,7 +136,7 @@ class AggregatedMobileDataStatsPuller { 


    private final RateLimiter mRateLimiter;



    AggregatedMobileDataStatsPuller(NetworkStatsManager networkStatsManager) {

    AggregatedMobileDataStatsPuller(@NonNull NetworkStatsManager networkStatsManager) {

        if (DEBUG) {

            if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {

                Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER,

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+3 −3
Original line number Diff line number Diff line
@@ -844,8 +844,6 @@ public class StatsPullAtomService extends SystemService { 
        mStorageManager = (StorageManager) mContext.getSystemService(StorageManager.class);

        mNetworkStatsManager = mContext.getSystemService(NetworkStatsManager.class);



        initMobileDataStatsPuller();



        // Initialize DiskIO

        mStoragedUidIoStatsReader = new StoragedUidIoStatsReader();
@@ -1015,7 +1013,8 @@ public class StatsPullAtomService extends SystemService { 
        }

        if (ENABLE_MOBILE_DATA_STATS_AGGREGATED_PULLER) {

            mAggregatedMobileDataStatsPuller =

                    new AggregatedMobileDataStatsPuller(mNetworkStatsManager);

                    new AggregatedMobileDataStatsPuller(

                            mContext.getSystemService(NetworkStatsManager.class));

        }

    }
@@ -1061,6 +1060,7 @@ public class StatsPullAtomService extends SystemService { 
        registerMobileBytesTransfer();

        registerMobileBytesTransferBackground();

        if (ENABLE_MOBILE_DATA_STATS_AGGREGATED_PULLER) {

            initMobileDataStatsPuller();

            registerMobileBytesTransferByProcState();

        }

        registerBytesTransferByTagAndMetered();