Merge "Support tracking latency of shell recents transition" (fd53d06f) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;
		import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_METRICS;
		import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;
		import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_RECENTS_ANIM;
		import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_TIMEOUT;
		import static com.android.server.wm.EventLogTags.WM_ACTIVITY_LAUNCH_TIME;

		@@ -102,6 +103,7 @@ import android.util.proto.ProtoOutputStream;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.util.FrameworkStatsLog;
		import com.android.internal.util.LatencyTracker;
		import com.android.internal.util.function.pooled.PooledLambda;
		import com.android.server.FgThread;
		import com.android.server.LocalServices;
		@@ -742,6 +744,12 @@ class ActivityMetricsLogger {
		info.mReason = activityToReason.valueAt(index);
		info.mLoggedTransitionStarting = true;
		if (info.mIsDrawn) {
		if (info.mReason == APP_TRANSITION_RECENTS_ANIM) {
		final LatencyTracker latencyTracker = r.mWmService.mLatencyTracker;
		final int duration = info.mSourceEventDelayMs + info.mCurrentTransitionDelayMs;
		mLoggerHandler.post(() -> latencyTracker.logAction(
		LatencyTracker.ACTION_START_RECENTS_ANIMATION, duration));
		}
		done(false /* abort */, info, "notifyTransitionStarting drawn", timestampNs);
		}
		}

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ import static android.window.TransitionInfo.FLAG_SHOW_WALLPAPER;
		import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;
		import static android.window.TransitionInfo.FLAG_TRANSLUCENT;

		import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_RECENTS_ANIM;
		import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_SPLASH_SCREEN;
		import static com.android.server.wm.ActivityTaskManagerInternal.APP_TRANSITION_WINDOWS_DRAWN;

		@@ -612,8 +613,6 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe

		handleNonAppWindowsInTransition(dc, mType, mFlags);

		reportStartReasonsToLogger();

		// The callback is only populated for custom activity-level client animations
		sendRemoteCallback(mClientAnimationStartCallback);

		@@ -702,6 +701,8 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		}
		mSyncId = -1;
		mOverrideOptions = null;

		reportStartReasonsToLogger();
		}

		/**
		@@ -894,11 +895,15 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		for (int i = mParticipants.size() - 1; i >= 0; --i) {
		ActivityRecord r = mParticipants.valueAt(i).asActivityRecord();
		if (r == null \|\| !r.mVisibleRequested) continue;
		int transitionReason = APP_TRANSITION_WINDOWS_DRAWN;
		// At this point, r is "ready", but if it's not "ALL ready" then it is probably only
		// ready due to starting-window.
		reasons.put(r, (r.mStartingData instanceof SplashScreenStartingData
		&& !r.mLastAllReadyAtSync)
		? APP_TRANSITION_SPLASH_SCREEN : APP_TRANSITION_WINDOWS_DRAWN);
		if (r.mStartingData instanceof SplashScreenStartingData && !r.mLastAllReadyAtSync) {
		transitionReason = APP_TRANSITION_SPLASH_SCREEN;
		} else if (r.isActivityTypeHomeOrRecents() && isTransientLaunch(r)) {
		transitionReason = APP_TRANSITION_RECENTS_ANIM;
		}
		reasons.put(r, transitionReason);
		}
		mController.mAtm.mTaskSupervisor.getActivityMetricsLogger().notifyTransitionStarting(
		reasons);