diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-01 23:19:47 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-01 23:19:47 +0000 |
| commit | f4552c06295d9604d4f5b173e509d7cc151f25a8 (patch) | |
| tree | 011ccae8cb15e7e6056323389fbe0f814dadb913 | |
| parent | 233ca2a433b410abe1a22ef995338ad831556977 (diff) | |
| parent | 3a49f0a4c5685162f430dc7fcd5c1a7967d007c8 (diff) | |
| download | native-android13-d1-release.tar.gz | |
Snap for 8892843 from 3a49f0a4c5685162f430dc7fcd5c1a7967d007c8 to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-release
Change-Id: I75c82dc6e6f1c1bc1c17da81bba65a27212c3083
| -rw-r--r-- | services/surfaceflinger/CompositionEngine/src/Output.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp index c3385a8a8b..f360504070 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp @@ -1218,7 +1218,8 @@ std::optional<base::unique_fd> Output::composeSurfaces( 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, |