Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dd5c487 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader." into... 

Merge "Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader." into udc-qpr-dev am: 7cac3f9f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24820838



Change-Id: Ic41cb1aa532136ffc7ff12d446be8eea29dd8cf4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9447ed2a 7cac3f9f

src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -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);