Merge "Include launched packageName in systrace." into mnc-dev (281dffb7) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -982,7 +982,7 @@ final class ActivityRecord {
		final long totalTime = stack.mLaunchStartTime != 0
		? (curTime - stack.mLaunchStartTime) : thisTime;
		if (SHOW_ACTIVITY_START_TIME) {
		Trace.asyncTraceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER, "launching", 0);
		Trace.asyncTraceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER, "launching: " + packageName, 0);
		EventLog.writeEvent(EventLogTags.AM_ACTIVITY_LAUNCH_TIME,
		userId, System.identityHashCode(this), shortComponentName,
		thisTime, totalTime);

+4 −4

Original line number	Diff line number	Diff line
		@@ -679,11 +679,11 @@ final class ActivityStack {
		"Launch completed; removing icicle of " + r.icicle);
		}

		private void startLaunchTraces() {
		private void startLaunchTraces(String packageName) {
		if (mFullyDrawnStartTime != 0) {
		Trace.asyncTraceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER, "drawing", 0);
		}
		Trace.asyncTraceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "launching", 0);
		Trace.asyncTraceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "launching: " + packageName, 0);
		Trace.asyncTraceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "drawing", 0);
		}

		@@ -698,11 +698,11 @@ final class ActivityStack {
		if (r.displayStartTime == 0) {
		r.fullyDrawnStartTime = r.displayStartTime = SystemClock.uptimeMillis();
		if (mLaunchStartTime == 0) {
		startLaunchTraces();
		startLaunchTraces(r.packageName);
		mLaunchStartTime = mFullyDrawnStartTime = r.displayStartTime;
		}
		} else if (mLaunchStartTime == 0) {
		startLaunchTraces();
		startLaunchTraces(r.packageName);
		mLaunchStartTime = mFullyDrawnStartTime = SystemClock.uptimeMillis();
		}
		}