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

13
src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
View File

@@ -321,8 +321,17 @@ public final class ConvertUtils {
final List<BatteryEvent> batteryEventList = new ArrayList<>();
final List<BatteryLevelData.PeriodBatteryLevelData> levelDataList =
batteryLevelData.getHourlyBatteryLevelsPerDay();
for (BatteryLevelData.PeriodBatteryLevelData oneDayData : levelDataList) {
for (int hourIndex = 0; hourIndex < oneDayData.getLevels().size() - 1; hourIndex++) {
final int dailyDataSize = levelDataList.size();
for (int dailyIndex = 0; dailyIndex < dailyDataSize; dailyIndex++) {
final BatteryLevelData.PeriodBatteryLevelData oneDayData =
levelDataList.get(dailyIndex);
final int hourDataSize = oneDayData.getLevels().size();
for (int hourIndex = 0; hourIndex < hourDataSize; hourIndex++) {
// For timestamp data on adjacent days, the last data (24:00) of the previous day is
// equal to the first data (00:00) of the next day, so skip sending EVEN_HOUR event.
if (dailyIndex < dailyDataSize - 1 && hourIndex == hourDataSize - 1) {
continue;
}
batteryEventList.add(
convertToBatteryEvent(
oneDayData.getTimestamps().get(hourIndex),