commit 583dd3a83a7a969dd765b41c494468145bd1b4d9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 28 01:29:33 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 28 01:29:33 2022 +0000
tree 2294ed17c4233b67ce2bdc608c03283b5832468a
parent 39a40beefe484fc1a295da4b1ffebbc00e53792d
parent db06ecf8ff98d9e161b1876fb3af828fff79ae12

Merge cherrypicks of [19050000] into tm-release.

Change-Id: Ieccad3a1ea9fd1e658a4500e2c069347e9385b8c

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,