summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-02-09 06:27:17 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-02-09 06:27:17 +0000
commit982daf25b8960e09b2ab39c7a5ba9b4101f74cf0 (patch)
treefa2f2cab9119789229dd8b236462738faf72dd8f
parentcbb2fa2f004366538d9452698db80bd1971cbf76 (diff)
parent19758a38a4f839f7120e414c836161bf0bceb164 (diff)
downloadbase-982daf25b8960e09b2ab39c7a5ba9b4101f74cf0.tar.gz
Merge "Fix BatteryStats counts foreground activity time."
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecord.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 4520579e030a..b685d484db79 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -4934,6 +4934,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
mAtmService.updateActivityUsageStats(this, Event.ACTIVITY_STOPPED);
break;
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);
// Fall through.
case DESTROYING: