Cleanup flag and code accumulate_network_stats_since_boot
Bug: 409611513
Test: regression tests
Flag: EXEMPT removing accumulate_network_stats_since_boot
Change-Id: Ib4b61c59731125981ce5f7a8e2ca41d8f1b8fff5
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 8f9008e..cbe3f50 100644
--- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
+++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
@@ -70,7 +70,6 @@
import static com.android.internal.util.FrameworkStatsLog.TIME_ZONE_DETECTOR_STATE__DETECTION_MODE__TELEPHONY;
import static com.android.internal.util.FrameworkStatsLog.TIME_ZONE_DETECTOR_STATE__DETECTION_MODE__UNKNOWN;
import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;
-import static com.android.server.stats.Flags.accumulateNetworkStatsSinceBoot;
import static com.android.server.stats.Flags.addMobileBytesTransferByProcStatePuller;
import static com.android.server.stats.Flags.addPressureStallInformationPuller;
import static com.android.server.stats.pull.IonMemoryUtil.readProcessSystemIonHeapSizesFromDebugfs;
@@ -1615,33 +1614,24 @@
final long bucketDurationMillis = Settings.Global.getLong(mContext.getContentResolver(),
NETSTATS_UID_BUCKET_DURATION, NETSTATS_UID_DEFAULT_BUCKET_DURATION_MS);
- if (accumulateNetworkStatsSinceBoot()) {
- NetworkStatsAccumulator accumulator = CollectionUtils.find(
- mNetworkStatsAccumulators, it -> it.hasEqualParameters(template, includeTags));
- if (accumulator == null) {
- accumulator = new NetworkStatsAccumulator(
- template,
- includeTags,
- bucketDurationMillis,
- bootTimeMillis - bucketDurationMillis);
- mNetworkStatsAccumulators.add(accumulator);
- }
-
- return accumulator.queryStats(currentTimeMillis,
- (aTemplate, aIncludeTags, aStartTime, aEndTime) -> {
- synchronized (mDataBytesTransferLock) {
- return getUidNetworkStatsSnapshotForTemplateLocked(aTemplate,
- aIncludeTags, aStartTime, aEndTime);
- }
- });
-
- } else {
- // Set end time in the future to include all stats in the active bucket.
- return getUidNetworkStatsSnapshotForTemplateLocked(
- template, includeTags,
- bootTimeMillis - bucketDurationMillis,
- currentTimeMillis + bucketDurationMillis);
+ NetworkStatsAccumulator accumulator = CollectionUtils.find(
+ mNetworkStatsAccumulators, it -> it.hasEqualParameters(template, includeTags));
+ if (accumulator == null) {
+ accumulator = new NetworkStatsAccumulator(
+ template,
+ includeTags,
+ bucketDurationMillis,
+ bootTimeMillis - bucketDurationMillis);
+ mNetworkStatsAccumulators.add(accumulator);
}
+
+ return accumulator.queryStats(currentTimeMillis,
+ (aTemplate, aIncludeTags, aStartTime, aEndTime) -> {
+ synchronized (mDataBytesTransferLock) {
+ return getUidNetworkStatsSnapshotForTemplateLocked(aTemplate,
+ aIncludeTags, aStartTime, aEndTime);
+ }
+ });
}
@GuardedBy("mDataBytesTransferLock")
diff --git a/services/core/java/com/android/server/stats/stats_flags.aconfig b/services/core/java/com/android/server/stats/stats_flags.aconfig
index 82d75cd..6290b10 100644
--- a/services/core/java/com/android/server/stats/stats_flags.aconfig
+++ b/services/core/java/com/android/server/stats/stats_flags.aconfig
@@ -24,14 +24,6 @@
}
flag {
- name: "accumulate_network_stats_since_boot"
- namespace: "statsd"
- description: "Accumulate results of NetworkStats queries to avoid hitting NetworkStats persistence limit"
- bug: "352537247"
- is_fixed_read_only: true
-}
-
-flag {
name: "add_pressure_stall_information_puller"
namespace: "statsd"
description: "Adds PressureStallInformation atom logging"
