commit 8d455727583eda44118bfddd8e1412b7a72cf067
author Patrick Williams <pdwilliams@google.com> Fri Aug 19 14:31:26 2022 +0000
committer Patrick Williams <pdwilliams@google.com> Thu Aug 25 10:37:31 2022 +0000
tree e983e03d0f0cab80d4460a1b43f454d096566475
parent a6fae494e2ec8ee6def198954e5c65feef8e0a8f

Use FenceResult in ScreenCaptureResults

Bug: b/232535621
Test: existing tests pass
Change-Id: Ida9e6bed0964aed97448b4cdd60a3383a0c56b62

cmds/screencap/screencap.cpp

diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp
index 7e6a521..4ed1c8e 100644
--- a/cmds/screencap/screencap.cpp
+++ b/cmds/screencap/screencap.cpp
@@ -193,7 +193,7 @@
     }
 
     ScreenCaptureResults captureResults = captureListener->waitForResults();
-    if (captureResults.result != NO_ERROR) {
+    if (!captureResults.fenceResult.ok()) {
         close(fd);
         return 1;
     }

core/jni/android_view_SurfaceControl.cpp

diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index bc299fd..e64b261 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -314,12 +314,12 @@
     binder::Status onScreenCaptureCompleted(
             const gui::ScreenCaptureResults& captureResults) override {
         JNIEnv* env = getenv();
-        if (captureResults.result != NO_ERROR || captureResults.buffer == nullptr) {
+        if (!captureResults.fenceResult.ok() || captureResults.buffer == nullptr) {
             env->CallVoidMethod(screenCaptureListenerObject,
                                 gScreenCaptureListenerClassInfo.onScreenCaptureComplete, nullptr);
             return binder::Status::ok();
         }
-        captureResults.fence->waitForever("");
+        captureResults.fenceResult.value()->waitForever("");
         jobject jhardwareBuffer = android_hardware_HardwareBuffer_createFromAHardwareBuffer(
                 env, captureResults.buffer->toAHardwareBuffer());
         const jint namedColorSpace =