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

Commit 1d58de33 authored by Kuan Wang's avatar Kuan Wang Committed by Android (Google) Code Review
Browse files

Merge "Add latest battery usage data when exporting battery usage data to EBS and Settings -> Apps"

parents bf386f73 54d7cd8a

src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java

+10 −0
Original line number Diff line number Diff line
@@ -137,6 +137,16 @@ public final class DataProcessor { 
        // Wrap and processed history map into easy-to-use format for UI rendering.

        final BatteryLevelData batteryLevelData =

                getLevelDataThroughProcessedHistoryMap(context, processedBatteryHistoryMap);

        // Loads the current battery usage data from the battery stats service.

        final Map<String, BatteryHistEntry> currentBatteryHistoryMap =

                getCurrentBatteryHistoryMapFromStatsService(context);

        // Replaces the placeholder in processedBatteryHistoryMap.

        for (Map.Entry<Long, Map<String, BatteryHistEntry>> mapEntry

                : processedBatteryHistoryMap.entrySet()) {

            if (mapEntry.getValue().containsKey(CURRENT_TIME_BATTERY_HISTORY_PLACEHOLDER)) {

                mapEntry.setValue(currentBatteryHistoryMap);

            }

        }

        return batteryLevelData == null

                ? null

                : getBatteryUsageMap(