commit f91f140a47d4edd913626717fbd1c08d0fbea7f7
author Tianhua Sun <tianhua.sun@amlogic.com> Mon May 09 05:45:46 2022 +0000
committer Hongguang <hgchen@google.com> Tue May 17 11:01:10 2022 -0700
tree 00f7abef22587b0cdbb1cf5ea3ab8ecc4d159632
parent 8ffb0288806aa7f41ff1b6f6ad9321980f955907

surfaceflinger: buffer was released early for clear client target requests [1/1]

PD#SWPL-76998
BUG=227223204

Problem:
buffer was released early when layer is not marked
as CLIENT composition and requests clear client target.

Solution:
do not early release the buffer when layer is not
marked as CLIENT composition.

Verify:
adt3

Change-Id: I1f6c9be0d4f2e2a3f10ab6bcd64a08d9322a71a3
Signed-off-by: Tianhua Sun <tianhua.sun@amlogic.com>

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