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

Merge "Fix BatteryStats counts foreground activity time." am: 982daf25b8 am: 96d22e94c0

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

Change-Id: I97a93591408ee7efe9c587743f0c3d20da26dc47
This commit is contained in:
Treehugger Robot
2022-02-09 06:57:25 +00:00
committed by Automerger Merge Worker
parent 1f929d9bd5 96d22e94c0
commit 523aa85575
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4934,6 +4934,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
mAtmService.updateActivityUsageStats(this, Event.ACTIVITY_STOPPED); mAtmService.updateActivityUsageStats(this, Event.ACTIVITY_STOPPED);
break; break;
case DESTROYED: case DESTROYED:
if (app != null && (mVisible || mVisibleRequested)) {
// The app may be died while visible (no PAUSED state).
mAtmService.updateBatteryStats(this, false);
}
mAtmService.updateActivityUsageStats(this, Event.ACTIVITY_DESTROYED); mAtmService.updateActivityUsageStats(this, Event.ACTIVITY_DESTROYED);
// Fall through. // Fall through.
case DESTROYING: case DESTROYING: