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

Commit f7c44a64 authored by Rachel Lee's avatar Rachel Lee Committed by Automerger Merge Worker
Browse files

Merge "Copy from DisplayEventReceiver.VsyncEventData" into udc-dev am: 940b5bff 

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



Change-Id: I6d6c602f3313f3dc0f2ac6ca9e1072869f9a273e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bb69401 940b5bff

core/java/android/view/Choreographer.java

+4 −4
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ public final class Choreographer { 


    private boolean mDebugPrintNextFrameTimeDelta;

    private int mFPSDivisor = 1;

    private DisplayEventReceiver.VsyncEventData mLastVsyncEventData =

    private final DisplayEventReceiver.VsyncEventData mLastVsyncEventData =

            new DisplayEventReceiver.VsyncEventData();

    private final FrameData mFrameData = new FrameData();
@@ -857,7 +857,7 @@ public final class Choreographer { 
                mFrameScheduled = false;

                mLastFrameTimeNanos = frameTimeNanos;

                mLastFrameIntervalNanos = frameIntervalNanos;

                mLastVsyncEventData = vsyncEventData;

                mLastVsyncEventData.copyFrom(vsyncEventData);

            }



            AnimationUtils.lockAnimationClock(frameTimeNanos / TimeUtils.NANOS_PER_MS);
@@ -1247,7 +1247,7 @@ public final class Choreographer { 
        private boolean mHavePendingVsync;

        private long mTimestampNanos;

        private int mFrame;

        private VsyncEventData mLastVsyncEventData = new VsyncEventData();

        private final VsyncEventData mLastVsyncEventData = new VsyncEventData();



        FrameDisplayEventReceiver(Looper looper, int vsyncSource, long layerHandle) {

            super(looper, vsyncSource, /* eventRegistration */ 0, layerHandle);
@@ -1287,7 +1287,7 @@ public final class Choreographer { 


                mTimestampNanos = timestampNanos;

                mFrame = frame;

                mLastVsyncEventData = vsyncEventData;

                mLastVsyncEventData.copyFrom(vsyncEventData);

                Message msg = Message.obtain(mHandler, this);

                msg.setAsynchronous(true);

                mHandler.sendMessageAtTime(msg, timestampNanos / TimeUtils.NANOS_PER_MS);

core/java/android/view/DisplayEventReceiver.java

+14 −0
Original line number Diff line number Diff line
@@ -164,6 +164,12 @@ public abstract class DisplayEventReceiver { 
                this.deadline = deadline;

            }



            void copyFrom(FrameTimeline other) {

                vsyncId = other.vsyncId;

                expectedPresentationTime = other.expectedPresentationTime;

                deadline = other.deadline;

            }



            // The frame timeline vsync id, used to correlate a frame

            // produced by HWUI with the timeline data stored in Surface Flinger.

            public long vsyncId = FrameInfo.INVALID_VSYNC_ID;
@@ -203,6 +209,14 @@ public abstract class DisplayEventReceiver { 
            this.frameInterval = frameInterval;

        }



        void copyFrom(VsyncEventData other) {

            preferredFrameTimelineIndex = other.preferredFrameTimelineIndex;

            frameInterval = other.frameInterval;

            for (int i = 0; i < frameTimelines.length; i++) {

                frameTimelines[i].copyFrom(other.frameTimelines[i]);

            }

        }



        public FrameTimeline preferredFrameTimeline() {

            return frameTimelines[preferredFrameTimelineIndex];

        }