commit db0c9ad08094454cff0c44a999feff3127773f8f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 08 17:12:05 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 08 17:12:05 2022 +0000
tree a8251fe65038cf2ac0dd99e385f4c5c086a1f497
parent ff5b946ad536e99f31d4b2949c5694414d408bf1
parent 13d90b93f6dccfd6f19656e034d3d2a987b0c1ce

Merge "libbinder: abort on Parcel::appendFrom in no-kernel mode" am: ec0d68e945 am: 13d90b93f6

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

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