Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant battery usage slot in database.

Browse Source 
Bug: 336423923
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Change-Id: I1b2d172a42a20a8cc8dc734498e37ed92e4624dd
This commit is contained in:
mxyyiyi
2024-04-23 13:28:44 +08:00
parent 893e8d1f4b
commit 740f348265
4 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
View File

@@ -31,6 +31,7 @@ import com.android.internal.annotations.VisibleForTesting;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -649,6 +650,22 @@ public class DataProcessManager {
// Process raw history map data into hourly timestamps.
final Map<Long, Map<String, BatteryHistEntry>> processedBatteryHistoryMap =
DataProcessor.getHistoryMapWithExpectedTimestamps(context, batteryHistoryMap);
if (isFromPeriodJob && !processedBatteryHistoryMap.isEmpty()) {
// For periodic job, only generate battery usage data between even-hour timestamps.
// Remove the timestamps:
// 1) earlier than the latest completed period job (startTimestamp)
// 2) later than current scheduled even-hour job (lastEvenHourTimestamp).
final long lastEvenHourTimestamp = TimestampUtils.getLastEvenHourTimestamp(currentTime);
final Set<Long> batteryHistMapKeySet = processedBatteryHistoryMap.keySet();
final long minTimestamp = Collections.min(batteryHistMapKeySet);
final long maxTimestamp = Collections.max(batteryHistMapKeySet);
if (minTimestamp < startTimestamp) {
processedBatteryHistoryMap.remove(minTimestamp);
}
if (maxTimestamp > lastEvenHourTimestamp) {
processedBatteryHistoryMap.remove(maxTimestamp);
}
}
// Wrap and processed history map into easy-to-use format for UI rendering.
final BatteryLevelData batteryLevelData =
DataProcessor.getLevelDataThroughProcessedHistoryMap(