Merge "Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader." into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
7cac3f9f7d
@@ -120,7 +120,7 @@ public final class BatteryUsageDataLoader {
|
|||||||
DatabaseUtils.sendBatteryUsageSlotData(context,
|
DatabaseUtils.sendBatteryUsageSlotData(context,
|
||||||
ConvertUtils.convertToBatteryUsageSlotList(batteryDiffDataMap));
|
ConvertUtils.convertToBatteryUsageSlotList(batteryDiffDataMap));
|
||||||
if (batteryDiffDataMap.values().stream().anyMatch(data ->
|
if (batteryDiffDataMap.values().stream().anyMatch(data ->
|
||||||
(!data.getAppDiffEntryList().isEmpty()
|
data != null && (!data.getAppDiffEntryList().isEmpty()
|
||||||
|| !data.getSystemDiffEntryList().isEmpty()))) {
|
|| !data.getSystemDiffEntryList().isEmpty()))) {
|
||||||
FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context)
|
FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context)
|
||||||
.detectSettingsAnomaly(context, /* displayDrain= */ 0);
|
.detectSettingsAnomaly(context, /* displayDrain= */ 0);
|
||||||
|
Reference in New Issue
Block a user