commit 28259105155a4aca7dfc206674a5ef064c2ab0c3
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 08 02:18:15 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 08 02:18:15 2022 +0000
tree 33842adfda7d1b90b6fc315a695ffc5326ff4972
parent ccf119a283b6c6c5bb410009450973f1c226e32d
parent 4b14c49dfbdc1fa028c860e26e7a7a6900c0abfe

Merge "Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced."

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

diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
index 805821f..c7cf70e 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
@@ -34,8 +34,6 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.fuelgauge.BatteryBroadcastReceiver;
-import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;
@@ -61,7 +59,6 @@
             new BatteryHistoryLoaderCallbacks();
 
     private boolean mIsChartDataLoaded = false;
-    private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
     private BatteryChartPreferenceController mBatteryChartPreferenceController;
 
     private final ContentObserver mBatteryObserver =
@@ -78,9 +75,7 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        final Context context = getContext();
-        refreshFeatureFlag(context);
-        mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_CHART);
+        mHistPref = findPreference(KEY_BATTERY_CHART);
         setBatteryChartPreferenceController();
     }
 
@@ -130,7 +125,6 @@
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        refreshFeatureFlag(context);
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         mBatteryChartPreferenceController =
                 new BatteryChartPreferenceController(
@@ -176,13 +170,6 @@
         }
     }
 
-    private void refreshFeatureFlag(Context context) {
-        if (mPowerUsageFeatureProvider == null) {
-            mPowerUsageFeatureProvider = FeatureFactory.getFactory(context)
-                    .getPowerUsageFeatureProvider(context);
-        }
-    }
-
     private void setBatteryChartPreferenceController() {
         if (mHistPref != null && mBatteryChartPreferenceController != null) {
             mHistPref.setChartPreferenceController(mBatteryChartPreferenceController);