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

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

BatteryStatsService: usage stats query update 

Update query for BatteryUsageStatsPerUid atom

Flag: com.android.server.power.optimization.add_battery_usage_stats_slice_atom

Bug: 353536815
Test: atest android.cts.statsdatom.batterystats
Change-Id: I8571a5b88c8fc95d604ae3b0dcc84c5c04331b76
parent a9f5bdf3

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

+3 −4
Original line number Diff line number Diff line
@@ -1018,7 +1018,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        if (Flags.addBatteryUsageStatsSliceAtom()) {

            statsManager.setPullAtomCallback(

                    FrameworkStatsLog.BATTERY_USAGE_STATS_PER_UID,

                    null, // use default PullAtomMetadata values

                    new StatsManager.PullAtomMetadata.Builder()

                            .setTimeoutMillis(3_000L)

                            .build(),

                    DIRECT_EXECUTOR,

                    pullAtomCallback);

        }
@@ -1098,14 +1100,11 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                                    DEVICE_CONFIG_NAMESPACE,

                                    MIN_CONSUMED_POWER_THRESHOLD_KEY,

                                    0);

                    final long sessionStart = 0;

                    final long sessionEnd = System.currentTimeMillis();

                    final BatteryUsageStatsQuery query =

                            new BatteryUsageStatsQuery.Builder()

                                    .setMaxStatsAgeMs(0)

                                    .includeProcessStateData()

                                    .includeVirtualUids()

                                    .aggregateSnapshots(sessionStart, sessionEnd)

                                    .setMinConsumedPowerThreshold(minConsumedPowerThreshold)

                                    .build();

                    bus = getBatteryUsageStats(List.of(query)).get(0);