From 8db101095526c49a58fd54bfb9d3501ea5351027 Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Mon, 15 Mar 2021 17:19:23 -0700 Subject: SurfaceFlinger: remove SurfaceControl level vsyncId setting FrameTimelineInfo can be set on the entire transaction, or for an individual SurfaceControl. Later in the code the FrameTimelineInfo is unified based on the most recent vsyncId. For this reason we are removing the setting of a FrameTimelineInfo on a SurfaceControl and instead we use the transaction's one. Test: adb shell /data/nativetest64/SurfaceFlinger_test/SurfaceFlinger_test Bug: 181978893 Bug: 169901895 Change-Id: Id4a8e46d57fbda66f6d478be82313482053dce20 --- libs/gui/BLASTBufferQueue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/gui/BLASTBufferQueue.cpp') diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp index f778232803..5b1b975283 100644 --- a/libs/gui/BLASTBufferQueue.cpp +++ b/libs/gui/BLASTBufferQueue.cpp @@ -401,7 +401,7 @@ void BLASTBufferQueue::processNextBufferLocked(bool useNextTransaction) { t->setFrameNumber(mSurfaceControl, bufferItem.mFrameNumber); if (!mNextFrameTimelineInfoQueue.empty()) { - t->setFrameTimelineInfo(mSurfaceControl, mNextFrameTimelineInfoQueue.front()); + t->setFrameTimelineInfo(mNextFrameTimelineInfoQueue.front()); mNextFrameTimelineInfoQueue.pop(); } -- cgit v1.2.3-59-g8ed1b