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

Commit f8595c60 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Remove flag com.android.server.power.optimization.battery_usage_stats_by_power_and_screen_state 

Bug: 409605152
Test: presubmit
Flag: EXEMPT removing com.android.server.power.optimization.battery_usage_stats_by_power_and_screen_state
Change-Id: I32b8d9fab7330cb7be33ca27de81ac9ba1669dca
parent c7d4a824

services/core/java/com/android/server/am/BatteryStatsService.java

+3 −4
Original line number Diff line number Diff line
@@ -3034,10 +3034,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        BatteryUsageStatsQuery.Builder builder = new BatteryUsageStatsQuery.Builder()

                .setMaxStatsAgeMs(0)

                .includeProcessStateData()

                .includePowerModels();

        if (Flags.batteryUsageStatsByPowerAndScreenState()) {

            builder.includeScreenStateData().includePowerStateData();

        }

                .includePowerModels()

                .includeScreenStateData()

                .includePowerStateData();

        if (accumulated) {

            builder.accumulated();

        }

services/core/java/com/android/server/power/stats/BatteryStatsDumpHelperImpl.java

+5 −6
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import android.os.BatteryStats; 
import android.os.BatteryUsageStats;

import android.os.BatteryUsageStatsQuery;



import com.android.server.power.optimization.Flags;



public class BatteryStatsDumpHelperImpl implements BatteryStats.BatteryStatsDumpHelper {

    private final BatteryUsageStatsProvider mBatteryUsageStatsProvider;
@@ -34,10 +32,11 @@ public class BatteryStatsDumpHelperImpl implements BatteryStats.BatteryStatsDump 
        BatteryUsageStatsQuery.Builder builder = new BatteryUsageStatsQuery.Builder()

                .setMaxStatsAgeMs(0);

        if (detailed) {

            builder.includePowerModels().includeProcessStateData().includeVirtualUids();

            if (Flags.batteryUsageStatsByPowerAndScreenState()) {

                builder.includePowerStateData().includeScreenStateData();

            }

            builder.includePowerModels()

                    .includeProcessStateData()

                    .includePowerStateData()

                    .includeScreenStateData()

                    .includeVirtualUids();

        }

        return mBatteryUsageStatsProvider.getBatteryUsageStats((BatteryStatsImpl) batteryStats,

                builder.build());

services/core/java/com/android/server/power/stats/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ flag { 
    bug: "324602949"

}



flag {

    name: "battery_usage_stats_by_power_and_screen_state"

    namespace: "backstage_power"

    description: "Batterystats dumpsys is enhanced by including power break-down by power s"

    bug: "352835319"

}



flag {

    name: "disable_composite_battery_usage_stats_atoms"

    namespace: "backstage_power"