Merge "Report dead activities as paused to stats."

3 files changed, 5 insertions, 6 deletions

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 16b23329dce5..22f77d6677e5 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -2530,10 +2530,6 @@ public final class ActivityManagerService extends ActivityManagerNative
         }
     }
 
-    void reportResumedActivityLocked(ActivityRecord r) {
-        updateUsageStats(r, true);
-    }
-
     private void dispatchProcessesChanged() {
         int N;
         synchronized (this) {
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 3e9d3cd2b9f1..9fedba64a287 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -787,9 +787,9 @@ final class ActivityStack {
                 EventLog.writeEvent(EventLogTags.AM_PAUSE_ACTIVITY,
                         prev.userId, System.identityHashCode(prev),
                         prev.shortComponentName);
+                mService.updateUsageStats(prev, false);
                 prev.app.thread.schedulePauseActivity(prev.appToken, prev.finishing,
                         userLeaving, prev.configChangeFlags);
-                mService.updateUsageStats(prev, false);
             } catch (Exception e) {
                 // Ignore exception, if process died other code will cleanup.
                 Slog.w(TAG, "Exception thrown during pause", e);
@@ -2888,6 +2888,9 @@ final class ActivityStack {
                                     r.userId, System.identityHashCode(r),
                                     r.task.taskId, r.shortComponentName,
                                     "proc died without state saved");
+                            if (r.state == ActivityState.RESUMED) {
+                                mService.updateUsageStats(r, false);
+                            }
                         }
                         removeActivityFromHistoryLocked(r);
 
diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java
index 4c9c19cf7250..22d7780a236f 100644
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1921,7 +1921,7 @@ public class ActivityStackSupervisor {
     boolean reportResumedActivityLocked(ActivityRecord r) {
         final ActivityStack stack = r.task.stack;
         if (isFrontStack(stack)) {
-            mService.reportResumedActivityLocked(r);
+            mService.updateUsageStats(r, true);
             mService.setFocusedActivityLocked(r);
         }
         if (allResumedActivitiesComplete()) {