Merge "Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader." into udc-qpr-dev am: 7cac3f9f7d
am: 5dd5c4874f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24820838 Change-Id: I2bd72f98041f50e050f1b418e6a63a79910df0fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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.getFeatureFactory().getPowerUsageFeatureProvider()
|
||||
.detectSettingsAnomaly(context, /* displayDrain= */ 0);
|
||||
|
Reference in New Issue
Block a user