summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author Chavi Weingarten <chaviw@google.com> 2023-11-21 20:01:20 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-21 20:01:20 +0000
commit0ede818a264d17ce148e54fdaedacbb00a2b5684 (patch)
treeb96528e966bbd4fea9d6d5f19f1ab84c14e2b292 /services/surfaceflinger/SurfaceFlinger.cpp
parent161da8e04f8d32bd4623cf22cfd0854698aed581 (diff)
parent4aa22af29dcc20801344d1af84b2a790aef29af9 (diff)
Merge "Ensure sub-hierarchy screenshots inherit secure from parent." into main
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 644b6ef30e..da2a6e0cc3 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -8958,6 +8958,7 @@ SurfaceFlinger::getLayerSnapshotsForScreenshots(uint32_t rootLayerId, uint32_t u
.genericLayerMetadataKeyMap = getGenericLayerMetadataKeyMap(),
.skipRoundCornersWhenProtected =
!getRenderEngine().supportsProtectedContent()};
+ args.rootSnapshot.isSecure = mLayerLifecycleManager.isLayerSecure(rootLayerId);
mLayerSnapshotBuilder.update(args);
auto getLayerSnapshotsFn =