| commit | 1c2dfc7362b98e65cf8d23f323990a5b119000e1 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu May 19 01:09:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 19 01:09:58 2022 +0000 |
| tree | 58bf4cc69b25531477f4a7c66ce5849bbdea8286 | |
| parent | 07f2340cb5d80a6fc7170c0168f26dc8dd748adc [diff] | |
| parent | fd4555389884c0ae576edc6d3055f1227f6cf55c [diff] |
Merge "surfaceflinger: buffer was released early for clear client target requests [1/1]" into tm-dev am: fd45553898 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18438457 Change-Id: Ia6f4d85d1f7d1ad6fea9d52d08081fded576d903 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp index 2d2b3df..aac478d 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -1365,7 +1365,10 @@ } } - outLayerFEs.push_back(&layerFE); + if (clientComposition) { + outLayerFEs.push_back(&layerFE); + } + clientCompositionLayers.insert(clientCompositionLayers.end(), std::make_move_iterator(results.begin()), std::make_move_iterator(results.end()));