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

Commit bc47f0e1 authored by Pascal Mütschard's avatar Pascal Mütschard Committed by Automerger Merge Worker
Browse files

Merge "Emit a trace slice if Choreographer re-syncs a frame." into udc-dev am:... 

Merge "Emit a trace slice if Choreographer re-syncs a frame." into udc-dev am: edc01788 am: d0fce288

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



Change-Id: I12ac0d9cfba2c41ba0dd39606052a4ecfb8337f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e06f238c d0fce288

core/java/android/view/Choreographer.java

+21 −6
Original line number Diff line number Diff line
@@ -785,12 +785,13 @@ public final class Choreographer { 
            DisplayEventReceiver.VsyncEventData vsyncEventData) {

        final long startNanos;

        final long frameIntervalNanos = vsyncEventData.frameInterval;

        boolean resynced = false;

        try {

            FrameTimeline timeline = mFrameData.update(frameTimeNanos, vsyncEventData);

            if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {

                Trace.traceBegin(Trace.TRACE_TAG_VIEW,

                        "Choreographer#doFrame " + vsyncEventData.preferredFrameTimeline().vsyncId);

                Trace.traceBegin(

                        Trace.TRACE_TAG_VIEW, "Choreographer#doFrame " + timeline.mVsyncId);

            }

            mFrameData.update(frameTimeNanos, vsyncEventData);

            synchronized (mLock) {

                if (!mFrameScheduled) {

                    traceMessage("Frame not scheduled");
@@ -828,7 +829,9 @@ public final class Choreographer { 
                                    + " ms in the past.");

                        }

                    }

                    mFrameData.update(frameTimeNanos, mDisplayEventReceiver, jitterNanos);

                    timeline = mFrameData.update(

                            frameTimeNanos, mDisplayEventReceiver, jitterNanos);

                    resynced = true;

                }



                if (frameTimeNanos < mLastFrameTimeNanos) {
@@ -860,6 +863,12 @@ public final class Choreographer { 
                mLastVsyncEventData = vsyncEventData;

            }



            if (resynced && Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {

                String message = String.format("Choreographer#doFrame - resynced to %d in %.1fms",

                        timeline.mVsyncId, (timeline.mDeadlineNanos - startNanos) * 0.000001f);

                Trace.traceBegin(Trace.TRACE_TAG_VIEW, message);

            }



            AnimationUtils.lockAnimationClock(frameTimeNanos / TimeUtils.NANOS_PER_MS);



            mFrameInfo.markInputHandlingStart();
@@ -875,6 +884,9 @@ public final class Choreographer { 
            doCallbacks(Choreographer.CALLBACK_COMMIT, frameIntervalNanos);

        } finally {

            AnimationUtils.unlockAnimationClock();

            if (resynced) {

                Trace.traceEnd(Trace.TRACE_TAG_VIEW);

            }

            Trace.traceEnd(Trace.TRACE_TAG_VIEW);

        }
@@ -1149,7 +1161,8 @@ public final class Choreographer { 
         * Update the frame data with a {@code DisplayEventReceiver.VsyncEventData} received from

         * native.

         */

        void update(long frameTimeNanos, DisplayEventReceiver.VsyncEventData vsyncEventData) {

        FrameTimeline update(

                long frameTimeNanos, DisplayEventReceiver.VsyncEventData vsyncEventData) {

            if (vsyncEventData.frameTimelines.length != mFrameTimelines.length) {

                throw new IllegalStateException(

                        "Length of native frame timelines received does not match Java. Did "
@@ -1164,6 +1177,7 @@ public final class Choreographer { 
                mFrameTimelines[i].update(frameTimeline.vsyncId,

                        frameTimeline.expectedPresentationTime, frameTimeline.deadline);

            }

            return mFrameTimelines[mPreferredFrameTimelineIndex];

        }



        /**
@@ -1171,7 +1185,7 @@ public final class Choreographer { 
         *

         * @param jitterNanos currentTime - frameTime

         */

        void update(

        FrameTimeline update(

                long frameTimeNanos, DisplayEventReceiver displayEventReceiver, long jitterNanos) {

            int newPreferredIndex = 0;

            final long minimumDeadline =
@@ -1192,6 +1206,7 @@ public final class Choreographer { 
            } else {

                update(frameTimeNanos, newPreferredIndex);

            }

            return mFrameTimelines[mPreferredFrameTimelineIndex];

        }



        void update(long frameTimeNanos, int newPreferredFrameTimelineIndex) {