commit cb8eb2be57f7b4ed2e6ad27caf931cdf925897ac
author Robin Lee <rgl@google.com> Tue Jan 19 18:38:04 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 19 18:38:04 2021 +0000
tree 0ba7109ba6d2dc4538ccc54e7ce9d23879182418
parent ff30b34cd24b23c8eb899ace1daf7a33db86a775
parent dcff00c8a82718f319488ce8548dcd192e841405

Merge "SurfaceFlinger: fix no small window displayed in PIP mode of DTVKIT [1/1]"

services/surfaceflinger/BufferLayer.cpp

diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index f0b0200..df26a3d 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -176,7 +176,14 @@
         if (!holes.isEmpty()) {
             targetSettings.clearRegion.orSelf(holes);
         }
-        return std::nullopt;
+
+        if (mSidebandStream != nullptr) {
+            // For surfaceview of tv sideband, there is no activeBuffer
+            // in bufferqueue, we need return LayerSettings.
+            return result;
+        } else {
+            return std::nullopt;
+        }
     }
     bool blackOutLayer = (isProtected() && !targetSettings.supportsProtectedContent) ||
             (isSecure() && !targetSettings.isSecure);