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

Commit 4b14c49d authored by Zaiyue Xue's avatar Zaiyue Xue
Browse files

Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced.

Bug: 256123455
Test: presubmit
Change-Id: Ia22eb8d11836b9b0d8ab74f4760e81966040a947
parent 09d47113
Loading
Loading
Loading
Loading
+1 −14
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import androidx.loader.content.Loader;
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 @@ public class PowerUsageAdvanced extends PowerUsageBase {
            new BatteryHistoryLoaderCallbacks();

    private boolean mIsChartDataLoaded = false;
    private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
    private BatteryChartPreferenceController mBatteryChartPreferenceController;

    private final ContentObserver mBatteryObserver =
@@ -78,9 +75,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
    @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 @@ public class PowerUsageAdvanced extends PowerUsageBase {

    @Override
    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
        refreshFeatureFlag(context);
        final List<AbstractPreferenceController> controllers = new ArrayList<>();
        mBatteryChartPreferenceController =
                new BatteryChartPreferenceController(
@@ -176,13 +170,6 @@ public class PowerUsageAdvanced extends PowerUsageBase {
        }
    }

    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);