From 54d7cd8a7aa0942cbf502dac7155299b50ec15a3 Mon Sep 17 00:00:00 2001
From: Kuan Wang <clairewang@google.com>
Date: Mon, 16 Jan 2023 11:27:16 +0800
Subject: [PATCH] Add latest battery usage data when exporting battery usage
 data to EBS and Settings -> Apps

Test: manual
Bug: 265130434
Change-Id: I1c6c1a831416d596b5bd71c6499f4c4672dbcdea
---
 .../settings/fuelgauge/batteryusage/DataProcessor.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index 3b04f907cc6..b61b755404a 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -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(