| commit | bf2fce4f8128462de585fb1021bc21e8f5017579 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jun 09 22:59:08 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 09 22:59:08 2020 +0000 |
| tree | c854ad5b6de9b559cd4c0ab434a2bf5f5bbc0301 | |
| parent | 05a28a1b60a07ed345fa31f44782c48098c2202e [diff] | |
| parent | 70b9c075f5aee7b27523c169fd10b67c846a603d [diff] |
Merge "Use fenceTime from drawingState instead of bufferInfo" into rvc-dev am: 6c457787c9 am: 70b9c075f5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11813840 Change-Id: Ie259a8322842b993414d7ea0117d40b46cdc5dea
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;