Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86f436dd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 5171a38f 508d938b

src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ public final class DataProcessor { 
            final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap,

            final List<BatteryLevelData.PeriodBatteryLevelData> hourlyBatteryLevelsPerDay) {

        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");

            return false;

        }

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

+0 −11
Original line number Diff line number Diff line
@@ -423,17 +423,6 @@ public class DataProcessorTest { 
                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

    public void getBatteryUsageMap_returnsExpectedResult() {

        final long[] batteryHistoryKeys = new long[]{