diff options
| author | 2022-08-09 22:48:18 +0000 | |
|---|---|---|
| committer | 2022-08-25 15:48:57 +0000 | |
| commit | fdb57bb7ed48e7efc3881d95f45d2937c05557fb (patch) | |
| tree | a8bccd16b8fe6e617ffbe2bf578dbe23c63f79a3 /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 501a72a312b06d5a3438ca4a55f73749d1278162 (diff) | |
Use FenceResult in ScreenCaptureResults
Bug: b/232535621
Test: atest SurfaceFlinger_test
Change-Id: I9295202cb2e72e9b078815b24468b588a89b6899
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index bdc8406575..b06d951bb6 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -6439,7 +6439,7 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::captureScreenCommon( std::unique_ptr<RenderArea> renderArea = renderAreaFuture.get(); if (!renderArea) { ALOGW("Skipping screen capture because of invalid render area."); - captureResults.result = NO_MEMORY; + captureResults.fenceResult = base::unexpected(NO_MEMORY); captureListener->onScreenCaptureCompleted(captureResults); return ftl::yield<FenceResult>(base::unexpected(NO_ERROR)).share(); } @@ -6456,9 +6456,7 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::captureScreenCommon( return ftl::Future(std::move(renderFuture)) .then([captureListener, captureResults = std::move(captureResults)]( FenceResult fenceResult) mutable -> FenceResult { - // TODO(b/232535621): Change ScreenCaptureResults to store a FenceResult. - captureResults.result = fenceStatus(fenceResult); - captureResults.fence = std::move(fenceResult).value_or(Fence::NO_FENCE); + captureResults.fenceResult = std::move(fenceResult); captureListener->onScreenCaptureCompleted(captureResults); return base::unexpected(NO_ERROR); }) |