Merge "Revert "Add launch type in activity startup trace"" (be154c01) · Commits · e / os / android_frameworks_base

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

+3 −15

Original line number	Original line	Diff line number	Diff line
	@@ -237,21 +237,9 @@ class ActivityMetricsLogger {
	if (mAssociatedTransitionInfo == null) {		if (mAssociatedTransitionInfo == null) {
	launchResult = ":failed";		launchResult = ":failed";
	} else {		} else {
	final String status;		launchResult = (abort ? ":canceled:" : mAssociatedTransitionInfo.mProcessSwitch
	if (abort) {		? ":completed:" : ":completed-same-process:")
	status = ":canceled:";		+ mAssociatedTransitionInfo.mLastLaunchedActivity.packageName;
	} else if (!mAssociatedTransitionInfo.mProcessSwitch) {
	status = ":completed-same-process:";
	} else {
	if (endInfo.mTransitionType == TYPE_TRANSITION_HOT_LAUNCH) {
	status = ":completed-hot:";
	} else if (endInfo.mTransitionType == TYPE_TRANSITION_WARM_LAUNCH) {
	status = ":completed-warm:";
	} else {
	status = ":completed-cold:";
	}
	}
	launchResult = status + mAssociatedTransitionInfo.mLastLaunchedActivity.packageName;
	}		}
	// Put a supplement trace as the description of the async trace with the same id.		// Put a supplement trace as the description of the async trace with the same id.
	Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, mTraceName + launchResult);		Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, mTraceName + launchResult);