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

Commit efc2331b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Broadcast cancel event of a CUJ session" into sc-dev am: 1ef54a4a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13675630

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I981d461ded4b9955809d4d6ab2a0691be9e6e564
parents 03dbfe42 1ef54a4a

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";