commit 7cac3f9f7d8e9035fb3489ca02400ac7a2599654
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 22 04:29:09 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 22 04:29:09 2023 +0000
tree f0658e67bf28452a7cc5f91fb929dd7b9b47aa5b
parent 620ac5cefa661f60d00f5cd6f2c8c2d376856136
parent 764337bd809a38c215800b30d84b843ad414537b

Merge "Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader." into udc-qpr-dev

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);