commit 764337bd809a38c215800b30d84b843ad414537b
author Zaiyue Xue <xuezaiyue@google.com> Thu Sep 21 19:34:09 2023 +0800
committer Zaiyue Xue <xuezaiyue@google.com> Thu Sep 21 19:34:09 2023 +0800
tree cdacdec52efd256a720d93bfbd56fee9c61fb322
parent a72b00a968cd32a5a19707f87b23b543a20e5f9f

Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader.

Bug: 301362376
Fix: 301362376
Test: manual
Change-Id: I75060fc3d1989522f58cae593b1c1f4063dbd6e5

src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
index cc0067b..55ef937 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
@@ -120,7 +120,7 @@
                     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);