From 764337bd809a38c215800b30d84b843ad414537b Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Thu, 21 Sep 2023 19:34:09 +0800
Subject: [PATCH] Fix JAVA_CRASH NullPointerException in
 BatteryUsageDataLoader.

Bug: 301362376
Fix: 301362376
Test: manual
Change-Id: I75060fc3d1989522f58cae593b1c1f4063dbd6e5
---
 .../settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
index cc0067b9bbf..55ef9374aec 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
@@ -120,7 +120,7 @@ public final class BatteryUsageDataLoader {
                     DatabaseUtils.sendBatteryUsageSlotData(context,
                             ConvertUtils.convertToBatteryUsageSlotList(batteryDiffDataMap));
                     if (batteryDiffDataMap.values().stream().anyMatch(data ->
-                            (!data.getAppDiffEntryList().isEmpty()
+                            data != null && (!data.getAppDiffEntryList().isEmpty()
                                     || !data.getSystemDiffEntryList().isEmpty()))) {
                         FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context)
                                 .detectSettingsAnomaly(context, /* displayDrain= */ 0);