commit 9e0017e9748e6cd1ed681f4d3aa9b888a02bfa3c
author Vishnu Nair <vishnun@google.com> Wed May 22 19:02:44 2024 +0000
committer Vishnu Nair <vishnun@google.com> Wed May 22 23:12:34 2024 +0000
tree 1b3d011562d6d16830da41d6b71b8499cfb5c0d3
parent dba72f5654f6cb489e500d96ce1317e083da85aa

Allow child layers to unset trusted overlay state 2/2

Test: presubmit
Bug: 339701674
Change-Id: I1a94b5e5dc1fa64a9e1eb3330b5c5b03af8d2b16

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 363b35c..6b97e2f 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -3902,7 +3902,7 @@
     }
 
     if (s.what & layer_state_t::eTrustedOverlayChanged) {
-        if (mDrawingState.isTrustedOverlay != s.isTrustedOverlay) {
+        if (mDrawingState.isTrustedOverlay != (s.trustedOverlay == gui::TrustedOverlay::ENABLED)) {
             ATRACE_FORMAT_INSTANT("%s: false [eTrustedOverlayChanged changed]", __func__);
             return false;
         }