commit ff5b946ad536e99f31d4b2949c5694414d408bf1
author Kevin Jeon <kevinjeon@google.com> Fri Jul 08 17:11:56 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 08 17:11:56 2022 +0000
tree ed4401fce50f4096551ed2f8ca4f20601e87c83b
parent d70bbe856c4277e469e4c8e47cfa8c9c41514161
parent 3708e1c3aa999753bf9806b87166d31cd1f09c04

Merge "Add tracepoints to dumpstate sections" am: 8e60888b4b am: 3708e1c3aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2147028

Change-Id: I3614b10a335376be19860fd29ca92b8f0a6d496e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/surfaceflinger/BufferStateLayer.cpp

diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index fecf5ae..3875f15 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -34,6 +34,8 @@
 #include "FrameTracer/FrameTracer.h"
 #include "TimeStats/TimeStats.h"
 
+#define EARLY_RELEASE_ENABLED false
+
 namespace android {
 
 using PresentState = frametimeline::SurfaceFrame::PresentState;
@@ -373,7 +375,7 @@
               addSurfaceFrameDroppedForBuffer(mDrawingState.bufferSurfaceFrameTX);
               mDrawingState.bufferSurfaceFrameTX.reset();
             }
-        } else if (mLastClientCompositionFence != nullptr) {
+        } else if (EARLY_RELEASE_ENABLED && mLastClientCompositionFence != nullptr) {
             callReleaseBufferCallback(mDrawingState.releaseBufferListener,
                                       mDrawingState.buffer->getBuffer(), mDrawingState.frameNumber,
                                       mLastClientCompositionFence,