Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove getLatestVsyncEventData in Choreographer." into tm-dev am: fa426b9d49 am: 1b3b5cb738

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

Change-Id: If0ddeae6ffc89892bdd68442f6615af58c405985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rachel Lee
2022-04-29 18:20:31 +00:00
committed by Automerger Merge Worker
parent 21adae3c77 1b3b5cb738
commit 6789acb7dd
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/view/Choreographer.java
View File

@@ -785,9 +785,7 @@ public final class Choreographer {
} }
} }
frameTimeNanos = startNanos - lastFrameOffset; frameTimeNanos = startNanos - lastFrameOffset;
DisplayEventReceiver.VsyncEventData latestVsyncEventData = frameData.updateFrameData(frameTimeNanos);
mDisplayEventReceiver.getLatestVsyncEventData();
frameData.updateFrameData(frameTimeNanos, latestVsyncEventData);
} }
if (frameTimeNanos < mLastFrameTimeNanos) { if (frameTimeNanos < mLastFrameTimeNanos) {
@@ -885,9 +883,7 @@ public final class Choreographer {
} }
frameTimeNanos = now - lastFrameOffset; frameTimeNanos = now - lastFrameOffset;
mLastFrameTimeNanos = frameTimeNanos; mLastFrameTimeNanos = frameTimeNanos;
DisplayEventReceiver.VsyncEventData latestVsyncEventData = frameData.updateFrameData(frameTimeNanos);
mDisplayEventReceiver.getLatestVsyncEventData();
frameData.updateFrameData(frameTimeNanos, latestVsyncEventData);
} }
} }
} }
@@ -1022,6 +1018,11 @@ public final class Choreographer {
return mVsyncId; return mVsyncId;
} }
/** Reset the vsync ID to invalid. */
void resetVsyncId() {
mVsyncId = FrameInfo.INVALID_VSYNC_ID;
}
/** /**
* The time in {@link System#nanoTime()} timebase which this frame is expected to be * The time in {@link System#nanoTime()} timebase which this frame is expected to be
* presented. * presented.
@@ -1069,12 +1070,14 @@ public final class Choreographer {
private FrameTimeline[] mFrameTimelines; private FrameTimeline[] mFrameTimelines;
private FrameTimeline mPreferredFrameTimeline; private FrameTimeline mPreferredFrameTimeline;
void updateFrameData(long frameTimeNanos, void updateFrameData(long frameTimeNanos) {
DisplayEventReceiver.VsyncEventData latestVsyncEventData) {
mFrameTimeNanos = frameTimeNanos; mFrameTimeNanos = frameTimeNanos;
mFrameTimelines = convertFrameTimelines(latestVsyncEventData); for (FrameTimeline ft : mFrameTimelines) {
mPreferredFrameTimeline = // The ID is no longer valid because the frame time that was registered with the ID
mFrameTimelines[latestVsyncEventData.preferredFrameTimelineIndex]; // no longer matches.
// TODO(b/205721584): Ask SF for valid vsync information.
ft.resetVsyncId();
}
} }
/** The time in nanoseconds when the frame started being rendered. */ /** The time in nanoseconds when the frame started being rendered. */