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

Commit 2e8dc1c4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix b/261390301: NullPointerException at... 

Merge "Fix b/261390301: NullPointerException at BatteryChartPreferenceController.addAllPreferences()"
parents d73c751f 76f19809

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

+8 −1
Original line number Diff line number Diff line
@@ -319,7 +319,8 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
        }





        if (mOnBatteryUsageUpdatedListener != null) {

        if (mOnBatteryUsageUpdatedListener != null && mBatteryUsageMap != null

                && mBatteryUsageMap.get(mDailyChartIndex) != null) {

            final BatteryDiffData slotUsageData =

                    mBatteryUsageMap.get(mDailyChartIndex).get(mHourlyChartIndex);

            mOnBatteryUsageUpdatedListener.onBatteryUsageUpdated(
@@ -359,6 +360,9 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
            mDailyChartIndex = 0;

        } else {

            mDailyChartView.setVisibility(View.VISIBLE);

            if (mDailyChartIndex >= mDailyViewModel.size()) {

                mDailyChartIndex = BatteryChartViewModel.SELECTED_INDEX_ALL;

            }

            mDailyViewModel.setSelectedIndex(mDailyChartIndex);

            mDailyChartView.setViewModel(mDailyViewModel);

        }
@@ -370,6 +374,9 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
            animateBatteryHourlyChartView(/*visible=*/ true);

            final BatteryChartViewModel hourlyViewModel =

                    mHourlyViewModels.get(mDailyChartIndex);

            if (mHourlyChartIndex >= hourlyViewModel.size()) {

                mHourlyChartIndex = BatteryChartViewModel.SELECTED_INDEX_ALL;

            }

            hourlyViewModel.setSelectedIndex(mHourlyChartIndex);

            mHourlyChartView.setViewModel(hourlyViewModel);

        }