commit e74432c55a7bd6cc904ecb673ac567e343cfe89b
author Robin Lee <rgl@google.com> Tue Jan 19 20:50:01 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 19 20:50:01 2021 +0000
tree b21b32e7595cc7c469dca5ea6f621b3346700f35
parent fb70c46f078d8aece9fb0ece522364468f7410ce
parent 205a70eaf13e3331d6412704eadbb97495e0cf96

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I504b91555be57f5a3b6f0d04757ebce136bd9611

services/surfaceflinger/BufferLayer.cpp

diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index 424a8b3..39ae2fd 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);