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

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

Merge "Avoid NullPointerException when batteryLevelData is null."

parents 36a3e977 8d881480

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