PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Consider usage map valid even if [all][all] is null."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-17 14:43:48 +00:00
committed by Android (Google) Code Review
parent 5171a38fe2 508d938bc8
commit 86f436dd0d
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
View File

@@ -896,7 +896,7 @@ public final class DataProcessor {
final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap, final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap,
final List<BatteryLevelData.PeriodBatteryLevelData> hourlyBatteryLevelsPerDay) { final List<BatteryLevelData.PeriodBatteryLevelData> hourlyBatteryLevelsPerDay) {
if (batteryUsageMap.get(SELECTED_INDEX_ALL) == null if (batteryUsageMap.get(SELECTED_INDEX_ALL) == null
|| batteryUsageMap.get(SELECTED_INDEX_ALL).get(SELECTED_INDEX_ALL) == null) { || !batteryUsageMap.get(SELECTED_INDEX_ALL).containsKey(SELECTED_INDEX_ALL)) {
Log.e(TAG, "no [SELECTED_INDEX_ALL][SELECTED_INDEX_ALL] in batteryUsageMap"); Log.e(TAG, "no [SELECTED_INDEX_ALL][SELECTED_INDEX_ALL] in batteryUsageMap");
return false; return false;
} }

11
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
View File

@@ -423,17 +423,6 @@ public class DataProcessorTest {
mContext, hourlyBatteryLevelsPerDay, new HashMap<>())).isNull(); mContext, hourlyBatteryLevelsPerDay, new HashMap<>())).isNull();
} }
@Test
public void getBatteryUsageMap_emptyHourlyData_returnNull() {
final long[] timestamps = {1000000L, 2000000L};
final int[] levels = {100, 99};
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
createHistoryMap(timestamps, levels);
assertThat(DataProcessor.getBatteryUsageMap(
mContext, new ArrayList<>(), batteryHistoryMap)).isNull();
}
@Test @Test
public void getBatteryUsageMap_returnsExpectedResult() { public void getBatteryUsageMap_returnsExpectedResult() {
final long[] batteryHistoryKeys = new long[]{ final long[] batteryHistoryKeys = new long[]{