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

Commit d588e55d authored by Vova Sharaienko's avatar Vova Sharaienko
Browse files

Flag cleanup AddBatteryUsageStatsSliceAtom 

Bug: 409608898
Flag: EXEMPT com.android.server.power.optimization.add_battery_usage_stats_slice_atom clean up
Test: atest android.cts.statsdatom.batterystats.BatteryUsageStatsTests#testBatteryUsageStatsPerUid
Change-Id: Ife78d0510b595c11a72a4b44faa5c4ca72f35046
parent f4024061

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

+7 −13
Original line number Diff line number Diff line
@@ -959,7 +959,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                    null, // use default PullAtomMetadata values

                    DIRECT_EXECUTOR, pullAtomCallback);

        }

        if (Flags.addBatteryUsageStatsSliceAtom()) {

        statsManager.setPullAtomCallback(

                FrameworkStatsLog.BATTERY_USAGE_STATS_PER_UID,

                new StatsManager.PullAtomMetadata.Builder()
@@ -968,7 +967,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                DIRECT_EXECUTOR,

                pullAtomCallback);

    }

    }



    /** StatsPullAtomCallback for pulling BatteryUsageStats data. */

    private class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCallback {
@@ -1025,10 +1023,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                    break;

                }

                case FrameworkStatsLog.BATTERY_USAGE_STATS_PER_UID: {

                    if (!Flags.addBatteryUsageStatsSliceAtom()) {

                        return StatsManager.PULL_SKIP;

                    }



                    @SuppressLint("MissingPermission")

                    final double minConsumedPowerThreshold =

                            DeviceConfig.getFloat(

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

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ flag { 
    is_exported: true

}



flag {

    name: "add_battery_usage_stats_slice_atom"

    namespace: "backstage_power"

    description: "Adds battery_usage_stats_slice atom"

    bug: "324602949"

}



flag {

    name: "disable_composite_battery_usage_stats_atoms"

    namespace: "backstage_power"