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

Commit 36b82270 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Remove context from powerUsageFeatureProvider 

PowerUsageFeatureProviderImpl is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: Iec81e98648fcb2f6a20978ef4ce164e1af50a804
parent 660c6328

src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ public class AutoRestrictionPreferenceController extends BasePreferenceControlle 
    private static final String KEY_SMART_BATTERY = "auto_restriction";

    private static final int ON = 1;

    private static final int OFF = 0;

    private PowerUsageFeatureProvider mPowerUsageFeatureProvider;

    private final PowerUsageFeatureProvider mPowerUsageFeatureProvider;



    public AutoRestrictionPreferenceController(Context context) {

        super(context, KEY_SMART_BATTERY);

        mPowerUsageFeatureProvider = FeatureFactory.getFactory(

                context).getPowerUsageFeatureProvider(context);

        mPowerUsageFeatureProvider =

                FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider();

    }



    @Override

src/com/android/settings/fuelgauge/BatteryBackupHelper.java

+4 −4
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ public final class BatteryBackupHelper implements BackupHelper { 
        writeBackupData(data, KEY_BUILD_MANUFACTURER, Build.MANUFACTURER);

        writeBackupData(data, KEY_BUILD_FINGERPRINT, Build.FINGERPRINT);

        // Add customized device build metadata fields.

        final PowerUsageFeatureProvider provider = FeatureFactory.getFactory(mContext)

                .getPowerUsageFeatureProvider(mContext);

        final PowerUsageFeatureProvider provider =

                FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider();

        writeBackupData(data, KEY_BUILD_METADATA_1, provider.getBuildMetadata1(mContext));

        writeBackupData(data, KEY_BUILD_METADATA_2, provider.getBuildMetadata2(mContext));
@@ -260,8 +260,8 @@ public final class BatteryBackupHelper implements BackupHelper { 
        if (mOptimizationModeBytes == null || mOptimizationModeBytes.length == 0) {

            return;

        }

        final PowerUsageFeatureProvider provider = FeatureFactory.getFactory(mContext)

                .getPowerUsageFeatureProvider(mContext);

        final PowerUsageFeatureProvider provider =

                FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider();

        if (!provider.isValidToRestoreOptimizationMode(mDeviceBuildInfoMap)) {

            return;

        }

src/com/android/settings/fuelgauge/BatteryInfo.java

+4 −5
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ public class BatteryInfo { 


                // Add projection if we have an estimate.

                if (remainingTimeUs != 0) {

                    PowerUsageFeatureProvider provider = FeatureFactory.getFactory(context)

                            .getPowerUsageFeatureProvider(context);

                    PowerUsageFeatureProvider provider =

                            FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider();

                    if (!mCharging && provider.isEnhancedBatteryPredictionEnabled(context)) {

                        points = provider.getEnhancedBatteryPredictionCurve(context, startTime);

                    } else {
@@ -201,7 +201,7 @@ public class BatteryInfo { 


        final long startTime = System.currentTimeMillis();

        PowerUsageFeatureProvider provider =

                FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);

                FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider();

        final long elapsedRealtimeUs =

                PowerUtil.convertMsToUs(SystemClock.elapsedRealtime());
@@ -211,8 +211,7 @@ public class BatteryInfo { 
        final boolean discharging =

                batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;



        if (discharging && provider != null

                && provider.isEnhancedBatteryPredictionEnabled(context)) {

        if (discharging && provider.isEnhancedBatteryPredictionEnabled(context)) {

            Estimate estimate = provider.getEnhancedBatteryPrediction(context);

            if (estimate != null) {

                Estimate.storeCachedEstimate(context, estimate);

src/com/android/settings/fuelgauge/BatteryUtils.java

+4 −4
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ public class BatteryUtils { 
        mContext = context;

        mPackageManager = context.getPackageManager();

        mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);

        mPowerUsageFeatureProvider = FeatureFactory.getFactory(context)

                .getPowerUsageFeatureProvider(context);

        mPowerUsageFeatureProvider =

                FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider();

    }



    public long getProcessTimeMs(@StatusType int type, @Nullable BatteryStats.Uid uid,
@@ -626,8 +626,8 @@ public class BatteryUtils { 
            if (Settings.Global.getInt(context.getContentResolver(),

                    SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS, 0) == 1) {

                return DockDefenderMode.TEMPORARILY_BYPASSED;

            } else if (batteryInfo.isBatteryDefender && FeatureFactory.getFactory(context)

                    .getPowerUsageFeatureProvider(context)

            } else if (batteryInfo.isBatteryDefender && FeatureFactory.getFeatureFactory()

                    .getPowerUsageFeatureProvider()

                    .isExtraDefend()) {

                return DockDefenderMode.ACTIVE;

            } else if (!batteryInfo.isBatteryDefender) {

src/com/android/settings/fuelgauge/DebugEstimatesLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class DebugEstimatesLoader extends AsyncLoaderCompat<List<BatteryInfo>> { 
    public List<BatteryInfo> loadInBackground() {

        Context context = getContext();

        PowerUsageFeatureProvider powerUsageFeatureProvider =

                FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);

                FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider();



        // get stuff we'll need for both BatteryInfo

        final long elapsedRealtimeUs = PowerUtil.convertMsToUs(