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

Commit 62a13f73 authored by Zaiyue Xue's avatar Zaiyue Xue Committed by Android (Google) Code Review
Browse files

Merge "Update the preference controller in search index for battery usage."

parents 862e9b30 c9d85ff6

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

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


    @Override

    public void onDestroy() {

        if (mActivity.isChangingConfigurations()) {

        if (mActivity == null || mActivity.isChangingConfigurations()) {

            BatteryDiffEntry.clearCache();

        }

        mHandler.removeCallbacksAndMessages(/*token=*/ null);

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

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {

                    final List<AbstractPreferenceController> controllers = new ArrayList<>();

                    controllers.add(new BatteryAppListPreferenceController(context,

                    controllers.add(new BatteryChartPreferenceController(context,

                            KEY_APP_LIST, null /* lifecycle */, null /* activity */,

                            null /* fragment */));

                    return controllers;