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

This commit is contained in:
Treehugger Robot
2023-09-22 04:29:09 +00:00
committed by Android (Google) Code Review

View File

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