commit cf7d9aa500bc00dab06bb5f5b5057dbb7ec349dd
author Ahan Wu <ahanwu@google.com> Wed Feb 24 17:15:00 2021 +0000
committer Ahan Wu <ahanwu@google.com> Tue Mar 02 16:45:23 2021 +0800
tree f9a3a22a891b4a845da1a2b31d37c7385c628873
parent ea5f042755856ab9b249f83adcb8e47e64a0cab9

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

diff --git a/core/java/com/android/internal/jank/FrameTracker.java b/core/java/com/android/internal/jank/FrameTracker.java
index 342456a..33ee8f0 100644
--- a/core/java/com/android/internal/jank/FrameTracker.java
+++ b/core/java/com/android/internal/jank/FrameTracker.java
@@ -203,6 +203,9 @@
         Trace.endAsyncSection(mSession.getName(), (int) mBeginVsyncId);
         mCancelled = true;
         removeObservers();
+        if (mListener != null) {
+            mListener.onNotifyCujEvents(mSession, InteractionJankMonitor.ACTION_SESSION_CANCEL);
+        }
     }
 
     @Override

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

diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java
index 0294ec3..fbc92c1 100644
--- a/core/java/com/android/internal/jank/InteractionJankMonitor.java
+++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java
@@ -99,7 +99,7 @@
     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";