diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java index c92b1b8c120de..8c4e90c81147d 100644 --- a/core/java/android/view/Choreographer.java +++ b/core/java/android/view/Choreographer.java @@ -195,7 +195,7 @@ public final class Choreographer { private boolean mDebugPrintNextFrameTimeDelta; private int mFPSDivisor = 1; - private final DisplayEventReceiver.VsyncEventData mLastVsyncEventData = + private 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.copyFrom(vsyncEventData); + mLastVsyncEventData = 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 final VsyncEventData mLastVsyncEventData = new VsyncEventData(); + private 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.copyFrom(vsyncEventData); + mLastVsyncEventData = vsyncEventData; Message msg = Message.obtain(mHandler, this); msg.setAsynchronous(true); mHandler.sendMessageAtTime(msg, timestampNanos / TimeUtils.NANOS_PER_MS); diff --git a/core/java/android/view/DisplayEventReceiver.java b/core/java/android/view/DisplayEventReceiver.java index 54db34e788e9f..2ab3bff485832 100644 --- a/core/java/android/view/DisplayEventReceiver.java +++ b/core/java/android/view/DisplayEventReceiver.java @@ -169,12 +169,6 @@ 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; @@ -214,14 +208,6 @@ 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]; }