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

Commit 1f88ab50 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Remove dependency on PowerStatsUidResolver from PowerStatsProcessors 

Bug: 346371828
Test: atest PowerStatsTests; atest PowerStatsTestsRavenwood
Flag: EXEMPT_bugfix
Change-Id: Ieaede11e69333a84ffde4f6250a62b5325e6ddee
parent b0c55e8d

services/core/java/com/android/server/am/BatteryStatsService.java

+1 −2
Original line number Diff line number Diff line
@@ -443,8 +443,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 


        mPowerStatsStore = new PowerStatsStore(systemDir, mHandler);

        mPowerAttributor = new MultiStatePowerAttributor(mContext, mPowerStatsStore, mPowerProfile,

                mCpuScalingPolicies, () -> mStats.getBatteryCapacity(),

                mPowerStatsUidResolver);

                mCpuScalingPolicies, () -> mStats.getBatteryCapacity());

        mPowerStatsScheduler = createPowerStatsScheduler(mContext);



        int accumulatedBatteryUsageStatsSpanSize = mContext.getResources().getInteger(

services/core/java/com/android/server/power/stats/processor/AudioPowerStatsProcessor.java

+2 −4
Original line number Diff line number Diff line
@@ -20,12 +20,10 @@ import android.os.BatteryConsumer; 
import android.os.BatteryStats;



import com.android.internal.os.PowerProfile;

import com.android.server.power.stats.PowerStatsUidResolver;



class AudioPowerStatsProcessor extends BinaryStatePowerStatsProcessor {

    AudioPowerStatsProcessor(PowerProfile powerProfile,

            PowerStatsUidResolver uidResolver) {

        super(BatteryConsumer.POWER_COMPONENT_AUDIO, uidResolver,

    AudioPowerStatsProcessor(PowerProfile powerProfile) {

        super(BatteryConsumer.POWER_COMPONENT_AUDIO,

                powerProfile.getAveragePower(PowerProfile.POWER_AUDIO));

    }

services/core/java/com/android/server/power/stats/processor/BinaryStatePowerStatsProcessor.java

+5 −11
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.os.PersistableBundle; 
import android.os.Process;



import com.android.internal.os.PowerStats;

import com.android.server.power.stats.PowerStatsUidResolver;

import com.android.server.power.stats.UsageBasedPowerEstimator;

import com.android.server.power.stats.format.BinaryStatePowerStatsLayout;
@@ -45,7 +44,6 @@ abstract class BinaryStatePowerStatsProcessor extends PowerStatsProcessor { 
    }



    private final int mPowerComponentId;

    private final PowerStatsUidResolver mUidResolver;

    private final UsageBasedPowerEstimator mUsageBasedPowerEstimator;

    private boolean mEnergyConsumerSupported;

    private int mInitiatingUid = Process.INVALID_UID;
@@ -60,18 +58,14 @@ abstract class BinaryStatePowerStatsProcessor extends PowerStatsProcessor { 
    private long[] mTmpDeviceStatsArray;

    private long[] mTmpUidStatsArray;



    BinaryStatePowerStatsProcessor(int powerComponentId,

            PowerStatsUidResolver uidResolver, double averagePowerMilliAmp) {

        this(powerComponentId, uidResolver, averagePowerMilliAmp,

                new BinaryStatePowerStatsLayout());

    BinaryStatePowerStatsProcessor(int powerComponentId, double averagePowerMilliAmp) {

        this(powerComponentId, averagePowerMilliAmp, new BinaryStatePowerStatsLayout());

    }



    BinaryStatePowerStatsProcessor(int powerComponentId,

            PowerStatsUidResolver uidResolver, double averagePowerMilliAmp,

    BinaryStatePowerStatsProcessor(int powerComponentId, double averagePowerMilliAmp,

            BinaryStatePowerStatsLayout statsLayout) {

        mPowerComponentId = powerComponentId;

        mUsageBasedPowerEstimator = new UsageBasedPowerEstimator(averagePowerMilliAmp);

        mUidResolver = uidResolver;

        mStatsLayout = statsLayout;

    }
@@ -115,13 +109,13 @@ abstract class BinaryStatePowerStatsProcessor extends PowerStatsProcessor { 
        if (state == STATE_ON) {

            if (item.eventCode == (BatteryStats.HistoryItem.EVENT_STATE_CHANGE

                    | BatteryStats.HistoryItem.EVENT_FLAG_START)) {

                mInitiatingUid = mUidResolver.mapUid(item.eventTag.uid);

                mInitiatingUid = item.eventTag.uid;

            }

        } else {

            if (mInitiatingUid == Process.INVALID_UID) {

                if (item.eventCode == (BatteryStats.HistoryItem.EVENT_STATE_CHANGE

                        | BatteryStats.HistoryItem.EVENT_FLAG_FINISH)) {

                    mInitiatingUid = mUidResolver.mapUid(item.eventTag.uid);

                    mInitiatingUid = item.eventTag.uid;

                }

            }

            recordUsageDuration(mPowerStats, mInitiatingUid, item.time);

services/core/java/com/android/server/power/stats/processor/CameraPowerStatsProcessor.java

+2 −4
Original line number Diff line number Diff line
@@ -20,12 +20,10 @@ import android.os.BatteryConsumer; 
import android.os.BatteryStats;



import com.android.internal.os.PowerProfile;

import com.android.server.power.stats.PowerStatsUidResolver;



class CameraPowerStatsProcessor extends BinaryStatePowerStatsProcessor {

    CameraPowerStatsProcessor(PowerProfile powerProfile,

            PowerStatsUidResolver uidResolver) {

        super(BatteryConsumer.POWER_COMPONENT_CAMERA, uidResolver,

    CameraPowerStatsProcessor(PowerProfile powerProfile) {

        super(BatteryConsumer.POWER_COMPONENT_CAMERA,

                powerProfile.getAveragePower(PowerProfile.POWER_CAMERA));

    }

services/core/java/com/android/server/power/stats/processor/FlashlightPowerStatsProcessor.java

+2 −4
Original line number Diff line number Diff line
@@ -20,12 +20,10 @@ import android.os.BatteryConsumer; 
import android.os.BatteryStats;



import com.android.internal.os.PowerProfile;

import com.android.server.power.stats.PowerStatsUidResolver;



class FlashlightPowerStatsProcessor extends BinaryStatePowerStatsProcessor {

    FlashlightPowerStatsProcessor(PowerProfile powerProfile,

            PowerStatsUidResolver uidResolver) {

        super(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT, uidResolver,

    FlashlightPowerStatsProcessor(PowerProfile powerProfile) {

        super(BatteryConsumer.POWER_COMPONENT_FLASHLIGHT,

                powerProfile.getAveragePower(PowerProfile.POWER_FLASHLIGHT));

    }