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

Commit 8d881480 authored by Kuan Wang's avatar Kuan Wang
Browse files

Avoid NullPointerException when batteryLevelData is null. 

Bug: 236101687
Bug: 241738105
Test: make RunSettingsRoboTests
Change-Id: Iee04f96083eff7ff5cd61a7c1f2eda20a6dc9149
parent 68ed2fb7

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

+6 −4
Original line number Diff line number Diff line
@@ -137,7 +137,9 @@ public final class DataProcessor { 
        // Wrap and processed history map into easy-to-use format for UI rendering.

        final BatteryLevelData batteryLevelData =

                getLevelDataThroughProcessedHistoryMap(context, processedBatteryHistoryMap);

        return getBatteryUsageMap(

        return batteryLevelData == null

                ? null

                : getBatteryUsageMap(

                        context,

                        batteryLevelData.getHourlyBatteryLevelsPerDay(),

                        processedBatteryHistoryMap);