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

Commit d86fcaad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the secure flag check for blackout layer issue" am: 0a7f5e2f 

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

Change-Id: If81b31315a3e5497c4285473ac66194e91bd7bac
parents def49278 0a7f5e2f

services/surfaceflinger/BufferLayer.cpp

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

    }

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

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

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

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

    if (blackOutLayer) {

        prepareClearClientComposition(layer, true /* blackout */);