Merge "Report instant event from CUJ UI thread once started" into main (5228fe63) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/jank/FrameTracker.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,7 @@ public class FrameTracker implements HardwareRendererObserver.OnFrameMetricsAvai
		Trace.asyncTraceForTrackBegin(Trace.TRACE_TAG_APP, name, name, (int) mBeginVsyncId);
		markEvent("FT#beginVsync", mBeginVsyncId);
		markEvent("FT#layerId", mSurfaceControl.getLayerId());
		markCujUiThread();
		mJankDataListenerRegistration =
		mSurfaceControlWrapper.addJankStatsListener(this, mSurfaceControl);
		if (!mSurfaceOnly) {
		@@ -433,6 +434,13 @@ public class FrameTracker implements HardwareRendererObserver.OnFrameMetricsAvai
		}
		}

		private void markCujUiThread() {
		if (Trace.isTagEnabled(Trace.TRACE_TAG_APP)) {
		// This is being called from the CUJ ui thread.
		Trace.instant(Trace.TRACE_TAG_APP, mConfig.getSessionName() + "#UIThread");
		}
		}

		private void notifyCujEvent(String action, @Reasons int reason) {
		if (mListener == null) return;
		mListener.onCujEvents(this, action, reason);