Merge "Avoid NullPointerException when batteryLevelData is null."

2022-08-09 08:33:41 +00:00
parent 36a3e977ea 8d88148036
commit 7dad6940d4
1 changed files with 6 additions and 4 deletions
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -137,10 +137,12 @@ 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(
-                context,
-                batteryLevelData.getHourlyBatteryLevelsPerDay(),
-                processedBatteryHistoryMap);
+        return batteryLevelData == null
+                ? null
+                : getBatteryUsageMap(
+                        context,
+                        batteryLevelData.getHourlyBatteryLevelsPerDay(),
+                        processedBatteryHistoryMap);
    }

    /**