diff options
| -rw-r--r-- | services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/stats/pull/StatsPullAtomService.java | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java b/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java index f28a91c52e59..2088e411f842 100644 --- a/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java +++ b/services/core/java/com/android/server/stats/pull/AggregatedMobileDataStatsPuller.java @@ -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; @@ -140,7 +141,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, diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index 0ffd002197c4..02f90f24714e 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -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(); |