PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zaiyue Xue
2022-11-11 03:37:10 +00:00
committed by Android (Google) Code Review
parent 862e9b3040 c9d85ff63d
commit 62a13f73a3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
View File

@@ -198,7 +198,7 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
@Override @Override
public void onDestroy() { public void onDestroy() {
if (mActivity.isChangingConfigurations()) { if (mActivity == null || mActivity.isChangingConfigurations()) {
BatteryDiffEntry.clearCache(); BatteryDiffEntry.clearCache();
} }
mHandler.removeCallbacksAndMessages(/*token=*/ null); mHandler.removeCallbacksAndMessages(/*token=*/ null);

2
src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
View File

@@ -197,7 +197,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
public List<AbstractPreferenceController> createPreferenceControllers( public List<AbstractPreferenceController> createPreferenceControllers(
Context context) { Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new BatteryAppListPreferenceController(context, controllers.add(new BatteryChartPreferenceController(context,
KEY_APP_LIST, null /* lifecycle */, null /* activity */, KEY_APP_LIST, null /* lifecycle */, null /* activity */,
null /* fragment */)); null /* fragment */));
return controllers; return controllers;