From eb72bfe90ad5f7ecd685c553cf35c64ade4a9ef5 Mon Sep 17 00:00:00 2001 From: Gopinath Elanchezhian Date: Thu, 22 Sep 2022 19:52:46 +0000 Subject: [PATCH] Revert "Add launch type in activity startup trace" This reverts commit fac9803757fb981f9e3576ab0b8fac79c544ea5e. Reason for revert: b/248319876 Change-Id: I44f37bf16192384442926d9ae0ed344cce5be450 --- .../server/wm/ActivityMetricsLogger.java | 18 +++--------------- 1 file 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 8ba34fa35de71..f8cbd8b3dd486 100644 --- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java @@ -231,21 +231,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);