commit 0a7f5e2f0a19b210fa7eacef9b542e2f04f4e8b2
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 23 23:07:05 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 23 23:07:05 2021 +0000
tree c4488e8e3bb9047ffffc302ba41901479dd64ffd
parent 007d5b68ef2b6725b28dead0ea3fae6156a2fc44
parent 50e9180dadae23cc488bf3ed4720e38c278d0235

Merge "Fix the secure flag check for blackout layer issue"

services/surfaceflinger/BufferLayer.cpp

diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index 5a24d51..082356d 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -186,7 +186,7 @@
         }
     }
     bool blackOutLayer = (isProtected() && !targetSettings.supportsProtectedContent) ||
-            (isSecure() && !targetSettings.isSecure);
+            ((isSecure() || isProtected()) && !targetSettings.isSecure);
     compositionengine::LayerFE::LayerSettings& layer = *result;
     if (blackOutLayer) {
         prepareClearClientComposition(layer, true /* blackout */);