| commit | 85368a410ffc71afa9aa45e818d2c79577bd3026 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jun 09 22:45:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 09 22:45:56 2020 +0000 |
| tree | 7cf0eef15641cfd812aba5bffe3c0e17b5ab9c5a | |
| parent | 2149d86e4081b7ae2eeb67c215b14d0e3851b124 [diff] | |
| parent | 6c457787c993f181c712260629f3e6c5dfa1b166 [diff] |
Merge "Use fenceTime from drawingState instead of bufferInfo" into rvc-dev am: 6c457787c9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11813840 Change-Id: I4e78f69221ddb178c80cde5066e88796b1c4c37c
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;