Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c1bc9bc authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ce29bd681a7e49025d5d5b3b50886965c7c7c8c
parents dcb3e949 cb8eb2be

services/surfaceflinger/BufferLayer.cpp

+8 −1
Original line number Diff line number Diff line
@@ -176,8 +176,15 @@ std::optional<compositionengine::LayerFE::LayerSettings> BufferLayer::prepareCli 
        if (!holes.isEmpty()) {

            targetSettings.clearRegion.orSelf(holes);

        }



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

    compositionengine::LayerFE::LayerSettings& layer = *result;