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

Commit f81389bc authored by Jack Richardson's avatar Jack Richardson Committed by Android (Google) Code Review
Browse files

Merge "Remove flag add_pressure_stall_information_puller" into main

parents d37a9688 139c5c8e

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

+1 −8
Original line number Diff line number Diff line
@@ -72,7 +72,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__UNKNOWN;

import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;

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;

import static com.android.server.stats.pull.IonMemoryUtil.readSystemIonHeapSizeFromDebugfs;

import static com.android.server.stats.pull.netstats.NetworkStatsUtils.fromPublicNetworkStats;
@@ -467,10 +466,6 @@ public class StatsPullAtomService extends SystemService { 
     */

    public static final boolean ENABLE_MOBILE_DATA_STATS_AGGREGATED_PULLER =

                addMobileBytesTransferByProcStatePuller();



    // Whether or not to enable the new puller with pressure stall information.

    public static final boolean ENABLE_PRESSURE_STALL_INFORMATION_PULLER =

                addPressureStallInformationPuller();

    private static int mPreviousThermalThrottlingStatus = Temperature.THROTTLING_NONE;



    // Puller locks
@@ -1064,9 +1059,7 @@ public class StatsPullAtomService extends SystemService { 
        registerPinnerServiceStats();

        registerHdrCapabilitiesPuller();

        registerCachedAppsHighWatermarkPuller();

        if (ENABLE_PRESSURE_STALL_INFORMATION_PULLER) {

        registerPressureStallInformation();

        }

        registerBatteryLife();

    }

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: "add_pressure_stall_information_puller"

    namespace: "statsd"

    description: "Adds PressureStallInformation atom logging"

    bug: "365731097"

    is_fixed_read_only: true

}



flag {

    name: "use_network_stats_query_summary"

    namespace: "statsd"