From cf7d9aa500bc00dab06bb5f5b5057dbb7ec349dd Mon Sep 17 00:00:00 2001 From: Ahan Wu Date: Wed, 24 Feb 2021 17:15:00 +0000 Subject: [PATCH] Broadcast cancel event of a CUJ session Broadcast cancel events of a CUJ session to who is interested in it like metrics collector. Bug: 171912046 Test: atest FrameworksCoreTests:InteractionJankMonitorTest FrameworksCoreTests:FrameTrackerTest Change-Id: I7bbef1448a8430d79163cdf55f5fba8f1c23d603 --- core/java/com/android/internal/jank/FrameTracker.java | 3 +++ .../java/com/android/internal/jank/InteractionJankMonitor.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/jank/FrameTracker.java b/core/java/com/android/internal/jank/FrameTracker.java index 342456a58091e..33ee8f04d83ed 100644 --- a/core/java/com/android/internal/jank/FrameTracker.java +++ b/core/java/com/android/internal/jank/FrameTracker.java @@ -203,6 +203,9 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener Trace.endAsyncSection(mSession.getName(), (int) mBeginVsyncId); mCancelled = true; removeObservers(); + if (mListener != null) { + mListener.onNotifyCujEvents(mSession, InteractionJankMonitor.ACTION_SESSION_CANCEL); + } } @Override diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java index 0294ec398484a..fbc92c1f99c44 100644 --- a/core/java/com/android/internal/jank/InteractionJankMonitor.java +++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java @@ -99,7 +99,7 @@ public class InteractionJankMonitor { private static final int DEFAULT_TRACE_THRESHOLD_FRAME_TIME_MILLIS = 64; public static final String ACTION_SESSION_BEGIN = ACTION_PREFIX + ".ACTION_SESSION_BEGIN"; - public static final String ACTION_SESSION_END = ACTION_PREFIX + ".ACTION_SESSION_END"; + public static final String ACTION_SESSION_CANCEL = ACTION_PREFIX + ".ACTION_SESSION_CANCEL"; public static final String ACTION_METRICS_LOGGED = ACTION_PREFIX + ".ACTION_METRICS_LOGGED"; public static final String BUNDLE_KEY_CUJ_NAME = ACTION_PREFIX + ".CUJ_NAME"; public static final String BUNDLE_KEY_TIMESTAMP = ACTION_PREFIX + ".TIMESTAMP";