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

Commit 56933a09 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Fix BatteryStats counts foreground activity time." am: 982daf25 am: 96d22e94 am: 523aa855 am: c96b2e4f

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

Change-Id: I4e3c78b13f63de40a9cdb6ddf62354e2fc5b7159
parents 993c5e10 c96b2e4f

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

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