Revert "SF: Introduce VsyncTimeline to VsyncPredictor"
This reverts commit b6c7f880460c81a6ce49ccb3334e2d2e1e020f81.
Reason for revert: Regressions tracked as childs on b/326599221
Change-Id: Ic0f959113a2d434d3b6412c90b58b85e5151e436
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 9e13144..cf5f55d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4702,14 +4702,7 @@
return TransactionReadiness::NotReady;
}
- const auto vsyncId = VsyncId{transaction.frameTimelineInfo.vsyncId};
-
- // Transactions with VsyncId are already throttled by the vsyncId (i.e. Choreographer issued
- // the vsyncId according to the frame rate override cadence) so we shouldn't throttle again
- // when applying the transaction. Otherwise we might throttle older transactions
- // incorrectly as the frame rate of SF changed before it drained the older transactions.
- if (ftl::to_underlying(vsyncId) == FrameTimelineInfo::INVALID_VSYNC_ID &&
- !mScheduler->isVsyncValid(expectedPresentTime, transaction.originUid)) {
+ if (!mScheduler->isVsyncValid(expectedPresentTime, transaction.originUid)) {
ATRACE_FORMAT("!isVsyncValid expectedPresentTime: %" PRId64 " uid: %d", expectedPresentTime,
transaction.originUid);
return TransactionReadiness::NotReady;
@@ -4717,7 +4710,8 @@
// If the client didn't specify desiredPresentTime, use the vsyncId to determine the
// expected present time of this transaction.
- if (transaction.isAutoTimestamp && frameIsEarly(expectedPresentTime, vsyncId)) {
+ if (transaction.isAutoTimestamp &&
+ frameIsEarly(expectedPresentTime, VsyncId{transaction.frameTimelineInfo.vsyncId})) {
ATRACE_FORMAT("frameIsEarly vsyncId: %" PRId64 " expectedPresentTime: %" PRId64,
transaction.frameTimelineInfo.vsyncId, expectedPresentTime);
return TransactionReadiness::NotReady;