From b2f8c095ac318646f7d962d04ae878d9060e20f8 Mon Sep 17 00:00:00 2001
From: Kuan Wang <clairewang@google.com>
Date: Wed, 4 Jan 2023 11:46:11 +0800
Subject: [PATCH] Add null check to avoid NullPointerException.

Test: make RunSettingsRoboTests
Bug: 264198981
Fix: 264198981
Change-Id: Ida2ff6beed5c0dba6329023b72e55daf1bf573f1
---
 .../android/settings/fuelgauge/batteryusage/DataProcessor.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index ff52774bacb..14b08dd0883 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -1448,6 +1448,9 @@ public final class DataProcessor {
 
         // Calculates all packages diff usage data in a specific time slot.
         for (String key : allBatteryHistEntryKeys) {
+            if (key == null) {
+                continue;
+            }
             final BatteryHistEntry currentEntry =
                     currentBatteryHistMap.getOrDefault(key, EMPTY_BATTERY_HIST_ENTRY);
             final BatteryHistEntry nextEntry =