commit 8ee92d11bf4795bfe1ee5e434386c624b5e49e67
author jeimysantiago <jeimysantiago@google.com> Fri Jul 21 15:40:13 2023 +0000
committer Jeimy Santiago Morales <jeimysantiago@google.com> Mon Jul 31 20:09:59 2023 +0000
tree 534f2911c78cbd6c9b432f9ab068908eeaa16e0f
parent d36fecde7f78d8213332c3a4ad2a0b04c077d316

Update Error Status Check

Updating check for captureDisplay ID error status.

Bug: 287081404
Test: atest displayScreenshot
Test: atest ScreenCaptureTest#captureDisplayWithUid
Change-Id: Ic1cdf47a5e5044ac25ab6b7e420d29b8421c8b5d

cmds/screencap/screencap.cpp

diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp
index c18b7ef..ee9c464 100644
--- a/cmds/screencap/screencap.cpp
+++ b/cmds/screencap/screencap.cpp
@@ -206,21 +206,19 @@
     ProcessState::self()->startThreadPool();
 
     sp<SyncScreenCaptureListener> captureListener = new SyncScreenCaptureListener();
-    status_t result = ScreenshotClient::captureDisplay(*displayIdOpt, captureListener);
-    if (result != NO_ERROR) {
-        close(fd);
-        return 1;
-    }
+    ScreenshotClient::captureDisplay(*displayIdOpt, captureListener);
 
     ScreenCaptureResults captureResults = captureListener->waitForResults();
     if (!captureResults.fenceResult.ok()) {
         close(fd);
+        fprintf(stderr, "Failed to take screenshot. Status: %d\n",
+            fenceStatus(captureResults.fenceResult));
         return 1;
     }
     ui::Dataspace dataspace = captureResults.capturedDataspace;
     sp<GraphicBuffer> buffer = captureResults.buffer;
 
-    result = buffer->lock(GraphicBuffer::USAGE_SW_READ_OFTEN, &base);
+    status_t result = buffer->lock(GraphicBuffer::USAGE_SW_READ_OFTEN, &base);
 
     if (base == nullptr || result != NO_ERROR) {
         String8 reason;