diff options
| author | Rob Carr <racarr@google.com> | 2019-04-09 00:45:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-09 00:45:22 +0000 |
| commit | 9761aa5261288ea3cac1a61dd33acdf95e7f9258 (patch) | |
| tree | 3887374697d098ac700d92f6c18a77bec7569229 /libs/gui/include | |
| parent | dea6d23a339157e2b1b35c194ea5d4c15fa5caff (diff) | |
| parent | 108b2c7d1cabbd1df12f0f20246ac1d5cce0d0be (diff) | |
| download | android_frameworks_native-9761aa5261288ea3cac1a61dd33acdf95e7f9258.tar.gz android_frameworks_native-9761aa5261288ea3cac1a61dd33acdf95e7f9258.tar.bz2 android_frameworks_native-9761aa5261288ea3cac1a61dd33acdf95e7f9258.zip | |
Merge "SurfaceFlinger: Indicate whether we have captured secure layers." into qt-dev
Diffstat (limited to 'libs/gui/include')
| -rw-r--r-- | libs/gui/include/gui/ISurfaceComposer.h | 8 | ||||
| -rw-r--r-- | libs/gui/include/gui/SurfaceComposerClient.h | 3 |
2 files changed, 7 insertions, 4 deletions
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<IBinder>& display, sp<GraphicBuffer>* 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<IBinder>& display, sp<GraphicBuffer>* 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 <class AA> 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<IBinder>& 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<GraphicBuffer>* outBuffer); + uint32_t rotation, bool captureSecureLayers, + sp<GraphicBuffer>* outBuffer, bool& outCapturedSecureLayers); static status_t capture(const sp<IBinder>& display, const ui::Dataspace reqDataSpace, const ui::PixelFormat reqPixelFormat, Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform, |