Merge "Report instant event from CUJ UI thread once started" into main
diff --git a/core/java/com/android/internal/jank/FrameTracker.java b/core/java/com/android/internal/jank/FrameTracker.java
index bf5df03..53ef49b 100644
--- a/core/java/com/android/internal/jank/FrameTracker.java
+++ b/core/java/com/android/internal/jank/FrameTracker.java
@@ -317,6 +317,7 @@
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 @@
}
}
+ 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);