Include cached battery usage in app-restriction proto dump

Bug: 203105544
Test: adb shell dumpsys activity app-restrictions --proto |
        gqui from rawproto:- proto
	$ANDROID_BUILD_TOP/frameworks/base/core/proto/android/os/appbatterystats.proto:android.os.AppBatteryStatsProto
	--protoprint_annotations=no
Change-Id: I220908b307fb0df293ae963329f4e16efed295b7

1 files changed, 12 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/am/AppBatteryTracker.java b/services/core/java/com/android/server/am/AppBatteryTracker.java
index 0cbc7ad404f5..3de5e1a98bdf 100644
--- a/services/core/java/com/android/server/am/AppBatteryTracker.java
+++ b/services/core/java/com/android/server/am/AppBatteryTracker.java
@@ -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;
         }