commit 0e7a0b38bd84c967785a9b16916d40b158a67015
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 07 17:31:24 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 07 17:31:24 2022 +0000
tree d96a4b2cce3bc84e72c0a8918db3a3c64fe39745
parent 77ebd39ecfd560959ba44ec0167d980d0030908b
parent 0fffa4dfb6bd6d012d88e0b06d0bfb764fd50e86

Merge "servicemanager: startup log" am: 2f47fec948 am: 0fffa4dfb6

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

Change-Id: I2a61d85bf85c78a9bda39e6f399bb837486db97c
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,