From a55436d37b45874d0c3ff1267132d6d04d289dc2 Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Mon, 16 May 2022 19:08:07 +0800
Subject: [PATCH] Distinguish process-switch for launch trace

So the perfetto processor won't recognize in-app transition
as an app startup.

Bug: 231612200
Test: Launch Settings from launcher and enter sub settings.
      There will be 2 "launching: com.android.settings" but
      only one trace at "Android App Startups".
Change-Id: I14a4fc1981e69dd27e2a5027f519db2dab4fff9f
---
 .../core/java/com/android/server/wm/ActivityMetricsLogger.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
index 1ea08f5cfea28..f2bcd1dbf5442 100644
--- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
@@ -212,7 +212,8 @@ class ActivityMetricsLogger {
             if (mAssociatedTransitionInfo == null) {
                 launchResult = ":failed";
             } else {
-                launchResult = (abort ? ":canceled:" : ":completed:")
+                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.