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

Commit 4afaa17d authored by Ivo Kay's avatar Ivo Kay
Browse files

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
parent b24d9f45

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

+18 −28
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ import static com.android.internal.util.FrameworkStatsLog.TIME_ZONE_DETECTOR_STA 
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,7 +1614,6 @@ public class StatsPullAtomService extends SystemService { 
        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) {
@@ -1634,14 +1632,6 @@ public class StatsPullAtomService extends SystemService { 
                                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);

        }

    }



    @GuardedBy("mDataBytesTransferLock")

services/core/java/com/android/server/stats/stats_flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -23,14 +23,6 @@ flag { 
    is_fixed_read_only: true

}



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"