commit ffee3bc5ba2b696721a86b615c1f0ef5ee2afa55
author Huihong Luo <huisinro@google.com> Tue Jan 17 16:14:35 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 17 16:14:35 2023 +0000
tree 069fc854c4f7c2d4391dbf95bedc96172ec0cdee
parent c50b4988e93872bfe023a4e099548f84bdfd998d

Revert "Migrate ITransactionCompletedListener to AIDL"

This reverts commit c50b4988e93872bfe023a4e099548f84bdfd998d.

Reason for revert: CTS failures, b/262211898

Change-Id: Iaff863f8af98c11dbf852cccad50e55148d87cee

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 56abc51..0017af0 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -2604,12 +2604,9 @@
         return;
     }
     ATRACE_FORMAT_INSTANT("callReleaseBufferCallback %s - %" PRIu64, getDebugName(), framenumber);
-    std::optional<os::ParcelFileDescriptor> fenceFd;
-    if (releaseFence) {
-        fenceFd = os::ParcelFileDescriptor(base::unique_fd(::dup(releaseFence->get())));
-    }
-    listener->onReleaseBuffer({buffer->getId(), framenumber}, fenceFd,
-                              static_cast<int32_t>(currentMaxAcquiredBufferCount));
+    listener->onReleaseBuffer({buffer->getId(), framenumber},
+                              releaseFence ? releaseFence : Fence::NO_FENCE,
+                              currentMaxAcquiredBufferCount);
 }
 
 void Layer::onLayerDisplayed(ftl::SharedFuture<FenceResult> futureFenceResult) {