Merge cherrypicks of ['googleplex-android-review.googlesource.com/24820838'] into sparse-10849031-L79100000963192060.

SPARSE_CHANGE: I75060fc3d1989522f58cae593b1c1f4063dbd6e5

Change-Id: I38afc57eac334153d3b033870cfd1cdc5e6afde8
This commit is contained in:
Android Build Coastguard Worker
2023-09-26 01:25:13 +00:00

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