Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ef54a4a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Broadcast cancel event of a CUJ session" into sc-dev

parents 82b51945 cf7d9aa5

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

+3 −0
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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";