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

Clear unused field mPowerUsageFeatureProvider in PowerUsageAdvanced.

Browse Source 
Bug: 256123455
Test: presubmit
Change-Id: Ia22eb8d11836b9b0d8ab74f4760e81966040a947
This commit is contained in:
Zaiyue Xue
2022-12-07 20:44:32 +08:00
parent 09d471132d
commit 4b14c49dfb
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,8 +34,6 @@ import androidx.loader.content.Loader;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.fuelgauge.BatteryBroadcastReceiver; 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.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
@@ -61,7 +59,6 @@ public class PowerUsageAdvanced extends PowerUsageBase {
new BatteryHistoryLoaderCallbacks(); new BatteryHistoryLoaderCallbacks();
private boolean mIsChartDataLoaded = false; private boolean mIsChartDataLoaded = false;
private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
private BatteryChartPreferenceController mBatteryChartPreferenceController; private BatteryChartPreferenceController mBatteryChartPreferenceController;
private final ContentObserver mBatteryObserver = private final ContentObserver mBatteryObserver =
@@ -78,9 +75,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
final Context context = getContext(); mHistPref = findPreference(KEY_BATTERY_CHART);
refreshFeatureFlag(context);
mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_CHART);
setBatteryChartPreferenceController(); setBatteryChartPreferenceController();
} }
@@ -130,7 +125,6 @@ public class PowerUsageAdvanced extends PowerUsageBase {
@Override @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
refreshFeatureFlag(context);
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
mBatteryChartPreferenceController = mBatteryChartPreferenceController =
new BatteryChartPreferenceController( 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() { private void setBatteryChartPreferenceController() {
if (mHistPref != null && mBatteryChartPreferenceController != null) { if (mHistPref != null && mBatteryChartPreferenceController != null) {
mHistPref.setChartPreferenceController(mBatteryChartPreferenceController); mHistPref.setChartPreferenceController(mBatteryChartPreferenceController);