From 108b2c7d1cabbd1df12f0f20246ac1d5cce0d0be Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Tue, 2 Apr 2019 16:32:58 -0700 Subject: SurfaceFlinger: Indicate whether we have captured secure layers. For purposes of the screen rotation animation the system server is allowed to capture secure (not protected) layers and trusted not to persist screenshots which may contain secure layers. However when displaying the screen rotation animation, the layer the screenshot is placed on will itself not be secure, so if we record the animation the recording will contain persisted versions of the secure content. Here we forward whether the screenshot contains secure content so that system server can do the right thing. Bug: 69703445 Test: Transaction_test#SetFlagsSecureEuidSystem Change-Id: I828cfe3faee3a0c84525f90b9df8b66e392bc240 --- services/surfaceflinger/RegionSamplingThread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services/surfaceflinger/RegionSamplingThread.cpp') diff --git a/services/surfaceflinger/RegionSamplingThread.cpp b/services/surfaceflinger/RegionSamplingThread.cpp index 35f11fc494..252ff0d611 100644 --- a/services/surfaceflinger/RegionSamplingThread.cpp +++ b/services/surfaceflinger/RegionSamplingThread.cpp @@ -392,7 +392,8 @@ void RegionSamplingThread::captureSample() { // // To avoid this, we drop the mutex while we call into SF. mMutex.unlock(); - mFlinger.captureScreenCommon(renderArea, traverseLayers, buffer, false); + bool ignored; + mFlinger.captureScreenCommon(renderArea, traverseLayers, buffer, false, ignored); mMutex.lock(); std::vector activeDescriptors; -- cgit v1.2.3-59-g8ed1b