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

Commit e4b90396 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Serialize PowerStatsExporter sessions" into main

parents d44adee6 b65d270d

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

+46 −43
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public class PowerStatsExporter { 
     */

    public void exportAggregatedPowerStats(BatteryUsageStats.Builder batteryUsageStatsBuilder,

            long monotonicStartTime, long monotonicEndTime) {

        synchronized (this) {

            boolean hasStoredSpans = false;

            long maxEndTime = monotonicStartTime;

            List<PowerStatsSpan.Metadata> spans = mPowerStatsStore.getTableOfContents();
@@ -106,12 +107,14 @@ public class PowerStatsExporter { 
                }

            }



        if (!hasStoredSpans || maxEndTime < monotonicEndTime - mBatterySessionTimeSpanSlackMillis) {

            if (!hasStoredSpans

                    || maxEndTime < monotonicEndTime - mBatterySessionTimeSpanSlackMillis) {

                mPowerStatsAggregator.aggregatePowerStats(maxEndTime, monotonicEndTime,

                        stats -> populateBatteryUsageStatsBuilder(batteryUsageStatsBuilder, stats));

            }

            mPowerStatsAggregator.reset();

        }

    }



    private void populateBatteryUsageStatsBuilder(

            BatteryUsageStats.Builder batteryUsageStatsBuilder, AggregatedPowerStats stats) {