Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d22e94 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix BatteryStats counts foreground activity time." am: 982daf25 

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

Change-Id: Iff15e0f1ddadcc6eae16962bb82197d8db5bc894
parents 64ba5041 982daf25

services/core/java/com/android/server/wm/ActivityRecord.java

+4 −0
Original line number Diff line number Diff line
@@ -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: