Merge "Distinguish process-switch for launch trace" into tm-dev am: 8890d47366

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18451948

Change-Id: Iee6da32bd8f04a4c827445b163b1d3f400fdc4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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.