Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Separate trace of trampoline launch with different packages" into sc-dev am: 05e83c1ce9

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

Change-Id: Iec7eae226378c3fbe54fcfdca0df3e77c19cf67a
This commit is contained in:
Riddle Hsu
2021-06-28 10:55:12 +00:00
committed by Automerger Merge Worker
parent a0ccb7685d 05e83c1ce9
commit a344927d01
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/wm/ActivityMetricsLogger.java
View File

@@ -609,13 +609,27 @@ class ActivityMetricsLogger {
return;
}
// If the launched activity is started from an existing active transition, it will be put
// into the transition info.
if (info != null && info.canCoalesce(launchedActivity)) {
// If we are already in an existing transition on the same display, only update the
// activity name, but not the other attributes.
if (DEBUG_METRICS) Slog.i(TAG, "notifyActivityLaunched consecutive launch");
if (DEBUG_METRICS) Slog.i(TAG, "notifyActivityLaunched update launched activity");
final boolean crossPackage =
!info.mLastLaunchedActivity.packageName.equals(launchedActivity.packageName);
// The trace name uses package name so different packages should be separated.
if (crossPackage) {
stopLaunchTrace(info);
}
mLastTransitionInfo.remove(info.mLastLaunchedActivity);
// Coalesce multiple (trampoline) activities from a single sequence together.
info.setLatestLaunchedActivity(launchedActivity);
// Update the latest one so it can be found when reporting fully-drawn.
mLastTransitionInfo.put(launchedActivity, info);
if (crossPackage) {
startLaunchTrace(info);
}
return;
}