commit 5c1bc9bc869805f90bc252df443502dcefdc7b24
author Robin Lee <rgl@google.com> Tue Jan 19 19:22:48 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 19 19:22:48 2021 +0000
tree be2e0301096b490393bad92cca490626a24f11bc
parent dcb3e949aefa580b419b791303a80e06940e3e87
parent cb8eb2be57f7b4ed2e6ad27caf931cdf925897ac

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1537927

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ce29bd681a7e49025d5d5b3b50886965c7c7c8c

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