From 8d88148036f29366f302161b5881cc243c5a3b57 Mon Sep 17 00:00:00 2001
From: Kuan Wang <clairewang@google.com>
Date: Tue, 9 Aug 2022 13:41:04 +0800
Subject: [PATCH] Avoid NullPointerException when batteryLevelData is null.

Bug: 236101687
Bug: 241738105
Test: make RunSettingsRoboTests
Change-Id: Iee04f96083eff7ff5cd61a7c1f2eda20a6dc9149
---
 .../settings/fuelgauge/batteryusage/DataProcessor.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index aadac8ed666..1af31aa6497 100644
--- 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);
     }
 
     /**