commit d70bbe856c4277e469e4c8e47cfa8c9c41514161
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 08 05:33:35 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 08 05:33:35 2022 +0000
tree e8fabdd7d2f74e3221e16e340bd705e5850db0a1
parent 0e7a0b38bd84c967785a9b16916d40b158a67015
parent 801138090ebdb23c6f710b3b0d2361c1c5c78497

Merge "libbinder: add tests for single-threaded and no-kernel-binder" am: 81cca30c14 am: 801138090e

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

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