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 --- libs/gui/include/gui/ISurfaceComposer.h | 8 +++++--- libs/gui/include/gui/SurfaceComposerClient.h | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'libs/gui/include') diff --git a/libs/gui/include/gui/ISurfaceComposer.h b/libs/gui/include/gui/ISurfaceComposer.h index 14d92bf04..415b2d58e 100644 --- a/libs/gui/include/gui/ISurfaceComposer.h +++ b/libs/gui/include/gui/ISurfaceComposer.h @@ -212,7 +212,7 @@ public: * it) around its center. */ virtual status_t captureScreen(const sp& display, sp* outBuffer, - const ui::Dataspace reqDataspace, + bool& outCapturedSecureLayers, const ui::Dataspace reqDataspace, const ui::PixelFormat reqPixelFormat, Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform, Rotation rotation = eRotateNone, @@ -241,8 +241,10 @@ public: virtual status_t captureScreen(const sp& display, sp* outBuffer, Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform, Rotation rotation = eRotateNone) { - return captureScreen(display, outBuffer, ui::Dataspace::V0_SRGB, ui::PixelFormat::RGBA_8888, - sourceCrop, reqWidth, reqHeight, useIdentityTransform, rotation); + bool outIgnored; + return captureScreen(display, outBuffer, outIgnored, ui::Dataspace::V0_SRGB, + ui::PixelFormat::RGBA_8888, sourceCrop, reqWidth, reqHeight, + useIdentityTransform, rotation); } template diff --git a/libs/gui/include/gui/SurfaceComposerClient.h b/libs/gui/include/gui/SurfaceComposerClient.h index f64fb61ec..9d344689d 100644 --- a/libs/gui/include/gui/SurfaceComposerClient.h +++ b/libs/gui/include/gui/SurfaceComposerClient.h @@ -509,7 +509,8 @@ public: static status_t capture(const sp& display, const ui::Dataspace reqDataSpace, const ui::PixelFormat reqPixelFormat, Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform, - uint32_t rotation, bool captureSecureLayers, sp* outBuffer); + uint32_t rotation, bool captureSecureLayers, + sp* outBuffer, bool& outCapturedSecureLayers); static status_t capture(const sp& display, const ui::Dataspace reqDataSpace, const ui::PixelFormat reqPixelFormat, Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform, -- cgit v1.2.3