commit a1c057f02732a9c47c910c1b1181c0cc40953dde
author Matt Buckley <mattbuckley@google.com> Mon Aug 01 21:45:32 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 01 21:45:32 2022 +0000
tree 0321749eeabccd1bc891db5225149c222bbd42bb
parent 5e01f670532e9084db5da559422ea3db4e0a84e6
parent 672e526d76b2a7835455030e9efc80e78da10a22

Merge "Get vsync period for ADPF CPU hints in SF using display mode" into tm-qpr-dev

services/surfaceflinger/CompositionEngine/src/Output.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
index aa0b152..bc11d87 100644
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -1243,7 +1243,8 @@
             ATRACE_NAME("ClientCompositionCacheHit");
             outputCompositionState.reusedClientComposition = true;
             setExpensiveRenderingExpected(false);
-            return base::unique_fd();
+            // b/239944175 pass the fence associated with the buffer.
+            return base::unique_fd(std::move(fd));
         }
         ATRACE_NAME("ClientCompositionCacheMiss");
         mClientCompositionRequestCache->add(tex->getBuffer()->getId(), clientCompositionDisplay,