commit 3efadb1deb5d7359a20ccd046355b8b923ee9af3
author chaviw <chaviw@google.com> Mon Jul 27 10:07:15 2020 -0700
committer chaviw <chaviw@google.com> Fri Jul 31 09:43:29 2020 -0700
tree 77e41931ef0a775e7ed2966ce17ae012bb51c1b1
parent 8f9a7705d5f4ad76c9e93a83f71850d2ffc1d73b

Added LayerCapture args to captureLayers functions

Pass LayerCaptureArgs and ScreenCaptureResults to captureLayers
functions.

Test: Recents takes screenshot
Test: SurfaceFlinger_test
Bug: 162367424

Change-Id: Ib4cfeb0e60c12009ffe271578f04522970a1f769

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 55f8034..c933d74 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -437,12 +437,8 @@
                             ScreenCaptureResults& captureResults) override;
     status_t captureDisplay(uint64_t displayOrLayerStack,
                             ScreenCaptureResults& captureResults) override;
-    status_t captureLayers(
-            const sp<IBinder>& parentHandle, sp<GraphicBuffer>* outBuffer,
-            const ui::Dataspace reqDataspace, const ui::PixelFormat reqPixelFormat,
-            const Rect& sourceCrop,
-            const std::unordered_set<sp<IBinder>, ISurfaceComposer::SpHash<IBinder>>& exclude,
-            float frameScale, bool childrenOnly) override;
+    status_t captureLayers(const LayerCaptureArgs& args,
+                           ScreenCaptureResults& captureResults) override;
 
     status_t getDisplayStats(const sp<IBinder>& displayToken, DisplayStatInfo* stats) override;
     status_t getDisplayState(const sp<IBinder>& displayToken, ui::DisplayState*) override;