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

Commit 249701ec authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

Merge "Fix the secure flag check for blackout layer issue" into sc-dev am: be7e0dfa 

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

Change-Id: I37fdb5bfc63e28b0ec52372af8d7ee46599661cf
parents 1ec7fa1c be7e0dfa

services/surfaceflinger/BufferLayer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ std::optional<compositionengine::LayerFE::LayerSettings> BufferLayer::prepareCli 
        }

        }

    }

    }

    const bool blackOutLayer = (isProtected() && !targetSettings.supportsProtectedContent) ||

    const bool blackOutLayer = (isProtected() && !targetSettings.supportsProtectedContent) ||

            (isSecure() && !targetSettings.isSecure);

            ((isSecure() || isProtected()) && !targetSettings.isSecure);

    const bool bufferCanBeUsedAsHwTexture =

    const bool bufferCanBeUsedAsHwTexture =

            mBufferInfo.mBuffer->getBuffer()->getUsage() & GraphicBuffer::USAGE_HW_TEXTURE;

            mBufferInfo.mBuffer->getBuffer()->getUsage() & GraphicBuffer::USAGE_HW_TEXTURE;

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

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