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

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

Change-Id: I9491607be039afdde63712966f52ad71c4d0778d

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

@@ -5194,6 +5194,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: