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

Commit b9a44a91 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()."... 

Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev am: 9c397837

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



Change-Id: I72232623545b854b4683c2ec1013d7bf5ac858a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b154b585 9c397837

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

+7 −6
Original line number Diff line number Diff line
@@ -697,12 +697,13 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 


        final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageData =

                DataProcessor.getBatteryUsageData(context, batteryHistoryMap);

        return batteryUsageData == null

                ? null

                : batteryUsageData

                        .get(BatteryChartViewModel.SELECTED_INDEX_ALL)

                        .get(BatteryChartViewModel.SELECTED_INDEX_ALL)

                        .getAppDiffEntryList();

        if (batteryUsageData == null) {

            return null;

        }

        BatteryDiffData allBatteryDiffData = batteryUsageData.get(

                BatteryChartViewModel.SELECTED_INDEX_ALL).get(

                BatteryChartViewModel.SELECTED_INDEX_ALL);

        return allBatteryDiffData == null ? null : allBatteryDiffData.getAppDiffEntryList();

    }



    /** Used for {@link AppBatteryPreferenceController}. */