Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include cached battery usage in app-restriction proto dump

Browse Source 
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
This commit is contained in:
Jing Ji
2022-03-31 15:41:06 -07:00
parent a5fdb746cf
commit b26cd864ee
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/am/AppBatteryTracker.java
View File

@@ -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;
}