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

Commit 46ef77a9 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Automerger Merge Worker
Browse files

Merge "Correctly start tracing only where we are counting frames" into sc-dev am: 5f6968d2 

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

Change-Id: I40ed60c48cef5faa59dc262572ee6d93627eba91
parents e8d5f9a7 5f6968d2

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

+16 −9
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener 
                        if (mBeginVsyncId != INVALID_ID) {

                            mSurfaceControlWrapper.addJankStatsListener(

                                    FrameTracker.this, mSurfaceControl);

                            postTraceStartMarker();

                        }

                    }

                }
@@ -208,15 +209,9 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener 
    public synchronized void begin() {

        mBeginVsyncId = mChoreographer.getVsyncId() + 1;

        mSession.setTimeStamp(System.nanoTime());

        mChoreographer.mChoreographer.postCallback(Choreographer.CALLBACK_INPUT, () -> {

            synchronized (FrameTracker.this) {

                if (mCancelled || mEndVsyncId != INVALID_ID) {

                    return;

                }

                mTracingStarted = true;

                Trace.beginAsyncSection(mSession.getName(), (int) mBeginVsyncId);

        if (mSurfaceControl != null) {

            postTraceStartMarker();

        }

        }, null);

        mRendererWrapper.addObserver(mObserver);

        if (DEBUG) {

            Log.d(TAG, "begin: " + mSession.getName() + ", begin=" + mBeginVsyncId);
@@ -229,6 +224,18 @@ public class FrameTracker extends SurfaceControl.OnJankDataListener 
        }

    }



    private void postTraceStartMarker() {

        mChoreographer.mChoreographer.postCallback(Choreographer.CALLBACK_INPUT, () -> {

            synchronized (FrameTracker.this) {

                if (mCancelled || mEndVsyncId != INVALID_ID) {

                    return;

                }

                mTracingStarted = true;

                Trace.beginAsyncSection(mSession.getName(), (int) mBeginVsyncId);

            }

        }, null);

    }



    /**

     * End the trace session of the CUJ.

     */