commit 95631e357195cbb70b76918e7e4c745ff4d82c90
author chaviw <chaviw@google.com> Tue Jun 09 13:43:32 2020 -0700
committer Chavi Weingarten <chaviw@google.com> Tue Jun 09 21:37:30 2020 +0000
tree 6aab60ffd3444996a0d35cb039d6e3fe031b5bee
parent e0d9770df147aa47680e8a5373c35d4c8b69e764

Use fenceTime from drawingState instead of bufferInfo

BufferInfo is updated in latchBuffer after updateTexImage. It would be
difficult to move gatherBufferInfo before updateTexImage since
BufferQueueLayer calls consumer->updateTexImage and relies on
the consumer getting pdated to get the correct buffer information.
BufferStateLayer gets the information directly from mDrawingState.

Instead just use the fenceTime from drawingState in updateTexImage in
BufferStateLayer.

Test: No easy way to see the issue
Fixes: 158457345
Change-Id: If42af7c2f8d550ce73181443a69b0f3073805e1c

services/surfaceflinger/BufferStateLayer.cpp

diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index 464ea9f..790f2ec 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -578,7 +578,7 @@
     }
 
     mFlinger->mTimeStats->setAcquireFence(layerId, mDrawingState.frameNumber,
-                                          mBufferInfo.mFenceTime);
+                                          std::make_shared<FenceTime>(mDrawingState.acquireFence));
     mFlinger->mTimeStats->setLatchTime(layerId, mDrawingState.frameNumber, latchTime);
 
     mCurrentStateModified = false;