summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-04-23 23:07:05 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-04-23 23:07:05 +0000
commit0a7f5e2f0a19b210fa7eacef9b542e2f04f4e8b2 (patch)
treec4488e8e3bb9047ffffc302ba41901479dd64ffd
parent007d5b68ef2b6725b28dead0ea3fae6156a2fc44 (diff)
parent50e9180dadae23cc488bf3ed4720e38c278d0235 (diff)
Merge "Fix the secure flag check for blackout layer issue"
-rw-r--r--services/surfaceflinger/BufferLayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index 5a24d5122a..082356dc6e 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -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 */);