Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b07b242c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Distinguish process-switch for launch trace" into tm-dev am: 8890d473 am: d8b5b700 am: 151134e7 am: 53bc77ac

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



Change-Id: I2666fe68d1689e6c2b9c9065987eee6bd0983fe6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6502099f 53bc77ac

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

+2 −1
Original line number Diff line number Diff line
@@ -214,7 +214,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.