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

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

+15 −3

Original line number	Original line	Diff line number	Diff line
	@@ -237,9 +237,21 @@ class ActivityMetricsLogger {
	if (mAssociatedTransitionInfo == null) {		if (mAssociatedTransitionInfo == null) {
	launchResult = ":failed";		launchResult = ":failed";
	} else {		} else {
	launchResult = (abort ? ":canceled:" : mAssociatedTransitionInfo.mProcessSwitch		final String status;
	? ":completed:" : ":completed-same-process:")		if (abort) {
	+ mAssociatedTransitionInfo.mLastLaunchedActivity.packageName;		status = ":canceled:";
			} 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);