From c9d85ff63d307e4afeab6fe93fc2457812bca3c2 Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Wed, 9 Nov 2022 17:39:19 +0800
Subject: [PATCH] Update the preference controller in search index for battery
 usage.

BatteryAppListPreferenceController is totally replaced by
BatteryChartPreferenceController now. Update the search index returns.

Bug: 256123455
Test: manual
Change-Id: I2340f1be0cee74771aab293a5df8551325c014be
---
 .../batteryusage/BatteryChartPreferenceController.java          | 2 +-
 .../settings/fuelgauge/batteryusage/PowerUsageAdvanced.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
index 6dd59b766ee..124d4b4296c 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
@@ -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);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
index 7b085f794a4..e376d85b786 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
@@ -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;