diff options
| author | 2019-05-08 23:04:43 +0000 | |
|---|---|---|
| committer | 2019-05-08 23:04:43 +0000 | |
| commit | 1dc64d287fd8695c7a413b56eac747f3def51476 (patch) | |
| tree | 63dc6e35164e3da3072c868fb72f80c54d27489d /libs/gui/SurfaceComposerClient.cpp | |
| parent | ce4cb0fdb54351bb30d962615be5552dbef93d83 (diff) | |
| parent | a1586de21f6c9191b99d2f3c815fcd15c48114e1 (diff) | |
Merge "[RESTRICT AUTOMERGE] SurfaceFlinger: Indicate whether we have captured secure layers." into pi-dev
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
| -rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 263c7ef9e0..100257629e 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -768,11 +768,12 @@ status_t SurfaceComposerClient::getHdrCapabilities(const sp<IBinder>& display, status_t ScreenshotClient::capture(const sp<IBinder>& display, Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight, int32_t minLayerZ, int32_t maxLayerZ, bool useIdentityTransform, uint32_t rotation, - bool captureSecureLayers, sp<GraphicBuffer>* outBuffer) { + bool captureSecureLayers, sp<GraphicBuffer>* outBuffer, + bool& outCapturedSecureLayers) { sp<ISurfaceComposer> s(ComposerService::getComposerService()); if (s == NULL) return NO_INIT; - status_t ret = s->captureScreen(display, outBuffer, sourceCrop, reqWidth, reqHeight, minLayerZ, - maxLayerZ, useIdentityTransform, + status_t ret = s->captureScreen(display, outBuffer, outCapturedSecureLayers, sourceCrop, + reqWidth, reqHeight, minLayerZ, maxLayerZ, useIdentityTransform, static_cast<ISurfaceComposer::Rotation>(rotation), captureSecureLayers); if (ret != NO_ERROR) { @@ -785,8 +786,9 @@ status_t ScreenshotClient::capture(const sp<IBinder>& display, Rect sourceCrop, uint32_t reqHeight, int32_t minLayerZ, int32_t maxLayerZ, bool useIdentityTransform, uint32_t rotation, sp<GraphicBuffer>* outBuffer) { + bool ignored; return capture(display, sourceCrop, reqWidth, reqHeight, - minLayerZ, maxLayerZ, useIdentityTransform, rotation, false, outBuffer); + minLayerZ, maxLayerZ, useIdentityTransform, rotation, false, outBuffer, ignored); } status_t ScreenshotClient::captureLayers(const sp<IBinder>& layerHandle, Rect sourceCrop, |