commit 26c4976f60930a933590ed046460f369b13a4866
author Vishnu Nair <vishnun@google.com> Tue Jan 18 22:58:52 2022 +0000
committer Vishnu Nair <vishnun@google.com> Tue Jan 18 22:58:55 2022 +0000
tree 1b3ae91af5426397532e6affd71e53a9b54399d4
parent 66ebf74ee5cce89d46cb1c893fd5ae713bb0ee27

SF: Fix buffer use after move

Change-Id: I5fa81999c1bccb5abc80ca3dd45d7d8da8ddad7b
Test: presubmit
Bug: 200284593

services/surfaceflinger/BufferStateLayer.cpp

diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index 6cecd89..0c93872 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -452,8 +452,8 @@
 
     setFrameTimelineVsyncForBufferTransaction(info, postTime);
 
-    if (buffer && dequeueTime && *dequeueTime != 0) {
-        const uint64_t bufferId = buffer->getId();
+    if (dequeueTime && *dequeueTime != 0) {
+        const uint64_t bufferId = mDrawingState.buffer->getId();
         mFlinger->mFrameTracer->traceNewLayer(layerId, getName().c_str());
         mFlinger->mFrameTracer->traceTimestamp(layerId, bufferId, frameNumber, *dequeueTime,
                                                FrameTracer::FrameEvent::DEQUEUE);