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

Commit bfc04582 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 am: 5dd5c487

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



Change-Id: I2bd72f98041f50e050f1b418e6a63a79910df0fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65c34137 5dd5c487

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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.getFeatureFactory().getPowerUsageFeatureProvider()

                        FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider()

                                .detectSettingsAnomaly(context, /* displayDrain= */ 0);

                                .detectSettingsAnomaly(context, /* displayDrain= */ 0);