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

Commit f7ea62a2 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Include cached battery usage in app-restriction proto dump" into tm-dev... 

Merge "Include cached battery usage in app-restriction proto dump" into tm-dev am: 9e607df5 am: 44ab74ca

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17530012



Change-Id: I79e5a1953cece4abed7d2825682ab289de237984
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88586295 44ab74ca

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

+12 −3
Original line number Diff line number Diff line
@@ -708,6 +708,7 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> 
        final double foregroundUsage = usage.getUsagePowerMah(PROCESS_STATE_FOREGROUND);

        final double backgroundUsage = usage.getUsagePowerMah(PROCESS_STATE_BACKGROUND);

        final double fgsUsage = usage.getUsagePowerMah(PROCESS_STATE_FOREGROUND_SERVICE);

        final double cachedUsage = usage.getUsagePowerMah(PROCESS_STATE_CACHED);



        if (foregroundUsage == 0 && backgroundUsage == 0 && fgsUsage == 0) {

            return;
@@ -724,6 +725,9 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> 
        dumpProcessStateStats(proto,

                AppBatteryStatsProto.UidStats.ProcessStateStats.FOREGROUND_SERVICE,

                fgsUsage);

        dumpProcessStateStats(proto,

                AppBatteryStatsProto.UidStats.ProcessStateStats.CACHED,

                cachedUsage);

        proto.end(token);

    }
@@ -864,9 +868,14 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> 


        double getUsagePowerMah(@BatteryConsumer.ProcessState int processState) {

            switch (processState) {

                case PROCESS_STATE_FOREGROUND: return mUsage[1];

                case PROCESS_STATE_BACKGROUND: return mUsage[2];

                case PROCESS_STATE_FOREGROUND_SERVICE: return mUsage[3];

                case PROCESS_STATE_FOREGROUND:

                    return mUsage[BATTERY_USAGE_INDEX_FOREGROUND];

                case PROCESS_STATE_BACKGROUND:

                    return mUsage[BATTERY_USAGE_INDEX_BACKGROUND];

                case PROCESS_STATE_FOREGROUND_SERVICE:

                    return mUsage[BATTERY_USAGE_INDEX_FOREGROUND_SERVICE];

                case PROCESS_STATE_CACHED:

                    return mUsage[BATTERY_USAGE_INDEX_CACHED];

            }

            return 0;

        }