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

SPARSE_CHANGE: I75060fc3d1989522f58cae593b1c1f4063dbd6e5

Change-Id: I732bd6a719df95de1fd8b6e28c8258aede2a6541
This commit is contained in:
Android Build Coastguard Worker
2023-09-25 16:53:12 +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);