commit 8ffc7b847ee395a73008b2e8d3c34adb1514311e
author chaviw <chaviw@google.com> Tue Aug 18 11:25:37 2020 -0700
committer chaviw <chaviw@google.com> Tue Aug 25 17:28:27 2020 -0700
tree 364b82dcf8d461dbba6c8f44facb5927df0d4873
parent 026919a26880cd28810a2cff96bb9561e17db50d

Pass IScreenCaptureListener to screen capture functions

The call is still synchronous but the SF screen capture requests take in
the IScreenCaptureListener object so the results can be sent back
asynchronously.

Test: SurfaceFlinger_test
Test: libgui_test
Bug: 162367424
Change-Id: If20fc69c1bb9eca71f76c151d2aee160a666c506

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index ccbb569..7572be3 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5493,7 +5493,7 @@
 }
 
 status_t SurfaceFlinger::captureDisplay(const DisplayCaptureArgs& args,
-                                        ScreenCaptureResults& captureResults) {
+                                        const sp<IScreenCaptureListener>& captureListener) {
     ATRACE_CALL();
 
     status_t validate = validateScreenshotPermissions(args);
@@ -5531,8 +5531,12 @@
     auto traverseLayers = [this, args, layerStack](const LayerVector::Visitor& visitor) {
         traverseLayersInLayerStack(layerStack, args.uid, visitor);
     };
-    return captureScreenCommon(std::move(renderAreaFuture), traverseLayers, reqSize,
-                               args.pixelFormat, captureResults);
+    ScreenCaptureResults captureResults;
+    status_t status = captureScreenCommon(std::move(renderAreaFuture), traverseLayers, reqSize,
+                                          args.pixelFormat, captureResults);
+    captureResults.result = status;
+    captureListener->onScreenCaptureComplete(captureResults);
+    return status;
 }
 
 status_t SurfaceFlinger::setSchedFifo(bool enabled) {
@@ -5575,7 +5579,7 @@
 }
 
 status_t SurfaceFlinger::captureDisplay(uint64_t displayOrLayerStack,
-                                        ScreenCaptureResults& captureResults) {
+                                        const sp<IScreenCaptureListener>& captureListener) {
     ui::LayerStack layerStack;
     wp<DisplayDevice> displayWeak;
     ui::Size size;
@@ -5596,8 +5600,7 @@
     }
 
     RenderAreaFuture renderAreaFuture = promise::defer([=] {
-        return DisplayRenderArea::create(displayWeak, Rect(), size,
-                                         captureResults.capturedDataspace,
+        return DisplayRenderArea::create(displayWeak, Rect(), size, dataspace,
                                          false /* useIdentityTransform */,
                                          false /* captureSecureLayers */);
     });
@@ -5606,12 +5609,16 @@
         traverseLayersInLayerStack(layerStack, CaptureArgs::UNSET_UID, visitor);
     };
 
-    return captureScreenCommon(std::move(renderAreaFuture), traverseLayers, size,
-                               ui::PixelFormat::RGBA_8888, captureResults);
+    ScreenCaptureResults captureResults;
+    status_t status = captureScreenCommon(std::move(renderAreaFuture), traverseLayers, size,
+                                          ui::PixelFormat::RGBA_8888, captureResults);
+    captureResults.result = status;
+    captureListener->onScreenCaptureComplete(captureResults);
+    return status;
 }
 
 status_t SurfaceFlinger::captureLayers(const LayerCaptureArgs& args,
-                                       ScreenCaptureResults& captureResults) {
+                                       const sp<IScreenCaptureListener>& captureListener) {
     ATRACE_CALL();
 
     status_t validate = validateScreenshotPermissions(args);
@@ -5720,8 +5727,12 @@
         });
     };
 
-    return captureScreenCommon(std::move(renderAreaFuture), traverseLayers, reqSize,
-                               args.pixelFormat, captureResults);
+    ScreenCaptureResults captureResults;
+    status_t status = captureScreenCommon(std::move(renderAreaFuture), traverseLayers, reqSize,
+                                          args.pixelFormat, captureResults);
+    captureResults.result = status;
+    captureListener->onScreenCaptureComplete(captureResults);
+    return status;
 }
 
 status_t SurfaceFlinger::captureScreenCommon(RenderAreaFuture renderAreaFuture,