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

Commit 3818a53e authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Run per procstate CPU time-in-state tracking on the main thread 

Procstate tracking will now be enabled unconditionally
when eBPF is supported by the kernel. Otherwise, it will be disabled.

Bug: 197162116
Test: atest FrameworksCoreTests:BatteryStatsTests

Change-Id: I200ef51b92aa19d42a10966aa6fea6f99d741f3f
parent c13e7277

core/java/android/os/BatteryStats.java

+6 −11
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ public abstract class BatteryStats implements Parcelable { 
     */

    public static int mapToInternalProcessState(int procState) {

        if (procState == ActivityManager.PROCESS_STATE_NONEXISTENT) {

            return ActivityManager.PROCESS_STATE_NONEXISTENT;

            return Uid.PROCESS_STATE_NONEXISTENT;

        } else if (procState == ActivityManager.PROCESS_STATE_TOP) {

            return Uid.PROCESS_STATE_TOP;

        } else if (ActivityManager.isForegroundService(procState)) {
@@ -911,6 +911,11 @@ public abstract class BatteryStats implements Parcelable { 
         * Total number of process states we track.

         */

        public static final int NUM_PROCESS_STATE = 7;

        /**

         * State of the UID when it has no running processes.  It is intentionally out of

         * bounds 0..NUM_PROCESS_STATE.

         */

        public static final int PROCESS_STATE_NONEXISTENT = NUM_PROCESS_STATE;



        // Used in dump

        static final String[] PROCESS_STATE_NAMES = {
@@ -930,16 +935,6 @@ public abstract class BatteryStats implements Parcelable { 
                "C"   // CACHED

        };



        /**

         * When the process exits one of these states, we need to make sure cpu time in this state

         * is not attributed to any non-critical process states.

         */

        public static final int[] CRITICAL_PROC_STATES = {

                Uid.PROCESS_STATE_TOP,

                Uid.PROCESS_STATE_FOREGROUND_SERVICE,

                Uid.PROCESS_STATE_FOREGROUND

        };



        public abstract long getProcessStateTime(int state, long elapsedRealtimeUs, int which);

        public abstract Timer getProcessStateTimer(int state);