commit 77ebd39ecfd560959ba44ec0167d980d0030908b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 07 04:42:36 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 07 04:42:36 2022 +0000
tree d94625201e5ee3ef2a70ad285ce40b764f05eabc
parent 6004b4172d1c0d797b097dc4da5639391480d466
parent fb9d7232ae079befc30e4112db219358625034df

Merge "libbinder: Move binderRpcTest to "presubmit-large"" am: 34b92e38a5 am: fb9d7232ae

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

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