Merge "Revert "Add launch type in activity startup trace""

1 files changed, 3 insertions, 15 deletions

diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
index 08d2e69846d3..7067ae474aad 100644
--- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
@@ -237,21 +237,9 @@ class ActivityMetricsLogger {
             if (mAssociatedTransitionInfo == null) {
                 launchResult = ":failed";
             } else {
-                final String status;
-                if (abort) {
-                    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;
+                launchResult = (abort ? ":canceled:" : mAssociatedTransitionInfo.mProcessSwitch
+                        ? ":completed:" : ":completed-same-process:")
+                        + mAssociatedTransitionInfo.mLastLaunchedActivity.packageName;
             }
             // Put a supplement trace as the description of the async trace with the same id.
             Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, mTraceName + launchResult);