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

Commit 0054447b authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge changes Ie40ff8ae,Iff6eb6de 

* changes:
  Add @GuardedBy annotations
  Add support for per process state data to MeasuredEnergyStats
parents c27e4cdf e713584c

core/java/android/os/BatteryConsumer.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -174,7 +174,7 @@ public abstract class BatteryConsumer { 
    public static final int PROCESS_STATE_BACKGROUND = 2;

    public static final int PROCESS_STATE_BACKGROUND = 2;

    public static final int PROCESS_STATE_FOREGROUND_SERVICE = 3;

    public static final int PROCESS_STATE_FOREGROUND_SERVICE = 3;





    static final int PROCESS_STATE_COUNT = 4;

    public static final int PROCESS_STATE_COUNT = 4;





    private static final String[] sProcessStateNames = new String[PROCESS_STATE_COUNT];

    private static final String[] sProcessStateNames = new String[PROCESS_STATE_COUNT];

core/java/android/os/BatteryStats.java

+18 −0
Original line number Original line Diff line number Diff line
@@ -653,6 +653,24 @@ public abstract class BatteryStats implements Parcelable { 
        }

        }

    }

    }





    /**

     * Maps BatteryStats.Uid process state to the BatteryConsumer process state.

     */

    public static @BatteryConsumer.ProcessState int

            mapUidProcessStateToBatteryConsumerProcessState(int processState) {

        switch (processState) {

            case BatteryStats.Uid.PROCESS_STATE_TOP:

                return BatteryConsumer.PROCESS_STATE_FOREGROUND;

            case BatteryStats.Uid.PROCESS_STATE_BACKGROUND:

            case BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING:

                return BatteryConsumer.PROCESS_STATE_BACKGROUND;

            case BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE:

                return BatteryConsumer.PROCESS_STATE_FOREGROUND_SERVICE;

            default:

                return BatteryConsumer.PROCESS_STATE_ANY;

        }

    }



    /**

    /**

     * Returns true if battery consumption is tracked on a per-process-state basis.

     * Returns true if battery consumption is tracked on a per-process-state basis.

     */

     */

core/java/com/android/internal/os/BatteryStatsImpl.java

+381 −42

File changed.

Preview size limit exceeded, changes collapsed.

core/java/com/android/internal/power/MeasuredEnergyStats.java

+320 −164

File changed.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -65,8 +65,9 @@ public class MockBatteryStatsImpl extends BatteryStatsImpl { 
        final boolean[] supportedStandardBuckets =

        final boolean[] supportedStandardBuckets =

                new boolean[MeasuredEnergyStats.NUMBER_STANDARD_POWER_BUCKETS];

                new boolean[MeasuredEnergyStats.NUMBER_STANDARD_POWER_BUCKETS];

        Arrays.fill(supportedStandardBuckets, true);

        Arrays.fill(supportedStandardBuckets, true);

        mGlobalMeasuredEnergyStats =

        mMeasuredEnergyStatsConfig = new MeasuredEnergyStats.Config(supportedStandardBuckets,

                new MeasuredEnergyStats(supportedStandardBuckets, customBucketNames);

                customBucketNames, new int[0], new String[]{""});

        mGlobalMeasuredEnergyStats = new MeasuredEnergyStats(mMeasuredEnergyStatsConfig);

    }

    }





    public TimeBase getOnBatteryTimeBase() {

    public TimeBase getOnBatteryTimeBase() {