Add latest battery usage data when exporting battery usage data to EBS

and Settings -> Apps

Test: manual
Bug: 265130434
Change-Id: I1c6c1a831416d596b5bd71c6499f4c4672dbcdea
This commit is contained in:
Kuan Wang
2023-01-16 11:27:16 +08:00
parent a7999098e0
commit 54d7cd8a7a

View File

@@ -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(