Merge "Report dead activities as paused to stats." (58b98d39) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityManagerService.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -2530,10 +2530,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		void reportResumedActivityLocked(ActivityRecord r) {
		updateUsageStats(r, true);
		}

		private void dispatchProcessesChanged() {
		int N;
		synchronized (this) {

+4 −1

Original line number	Diff line number	Diff line
		@@ -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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -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()) {