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

Merge "Fix time-in-foreground to include PROCESS_STATE_FOREGROUND_SERVICE" into sc-dev am: 4113199752

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

Change-Id: I62e891f31ddad5e4e2bdce79d2ae57b81de3675d
This commit is contained in:
Dmitri Plotnikov
2021-05-24 20:09:09 +00:00
committed by Automerger Merge Worker
parent 9f03ab3b43 4113199752
commit 73fcaf480a
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/com/android/internal/os/BatteryUsageStatsProvider.java
View File

@@ -180,29 +180,28 @@ public class BatteryUsageStatsProvider {
}
private long getProcessForegroundTimeMs(BatteryStats.Uid uid, long realtimeUs) {
final long topStateDurationMs = uid.getProcessStateTime(BatteryStats.Uid.PROCESS_STATE_TOP,
realtimeUs, BatteryStats.STATS_SINCE_CHARGED) / 1000;
long foregroundActivityDurationMs = 0;
final long topStateDurationUs = uid.getProcessStateTime(BatteryStats.Uid.PROCESS_STATE_TOP,
realtimeUs, BatteryStats.STATS_SINCE_CHARGED);
long foregroundActivityDurationUs = 0;
final BatteryStats.Timer foregroundActivityTimer = uid.getForegroundActivityTimer();
if (foregroundActivityTimer != null) {
foregroundActivityDurationMs = foregroundActivityTimer.getTotalTimeLocked(realtimeUs,
BatteryStats.STATS_SINCE_CHARGED) / 1000;
foregroundActivityDurationUs = foregroundActivityTimer.getTotalTimeLocked(realtimeUs,
BatteryStats.STATS_SINCE_CHARGED);
}
// Use the min value of STATE_TOP time and foreground activity time, since both of these
// times are imprecise
final long foregroundDurationMs = Math.min(topStateDurationMs,
foregroundActivityDurationMs);
long totalForegroundDurationUs = Math.min(topStateDurationUs, foregroundActivityDurationUs);
long foregroundServiceDurationMs = 0;
final BatteryStats.Timer foregroundServiceTimer = uid.getForegroundServiceTimer();
if (foregroundServiceTimer != null) {
foregroundServiceDurationMs = foregroundServiceTimer.getTotalTimeLocked(realtimeUs,
BatteryStats.STATS_SINCE_CHARGED) / 1000;
}
totalForegroundDurationUs += uid.getProcessStateTime(
BatteryStats.Uid.PROCESS_STATE_FOREGROUND, realtimeUs,
BatteryStats.STATS_SINCE_CHARGED);
return foregroundDurationMs + foregroundServiceDurationMs;
totalForegroundDurationUs += uid.getProcessStateTime(
BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE, realtimeUs,
BatteryStats.STATS_SINCE_CHARGED);
return totalForegroundDurationUs / 1000;
}
private long getProcessBackgroundTimeMs(BatteryStats.Uid uid, long realtimeUs) {