commit fd4555389884c0ae576edc6d3055f1227f6cf55c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 19 00:04:33 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 19 00:04:33 2022 +0000
tree 58bf4cc69b25531477f4a7c66ce5849bbdea8286
parent 56ceadd8672e07677fd82d853fc282c4c8dee47f
parent f91f140a47d4edd913626717fbd1c08d0fbea7f7

Merge "surfaceflinger: buffer was released early for clear client target requests [1/1]" into tm-dev

services/surfaceflinger/CompositionEngine/src/Output.cpp

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()));