From 8d455727583eda44118bfddd8e1412b7a72cf067 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 19 Aug 2022 14:31:26 +0000 Subject: [PATCH] Use FenceResult in ScreenCaptureResults Bug: b/232535621 Test: existing tests pass Change-Id: Ida9e6bed0964aed97448b4cdd60a3383a0c56b62 --- cmds/screencap/screencap.cpp | 2 +- core/jni/android_view_SurfaceControl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp index 7e6a521ca46c4..4ed1c8e206740 100644 --- a/cmds/screencap/screencap.cpp +++ b/cmds/screencap/screencap.cpp @@ -193,7 +193,7 @@ int main(int argc, char** argv) } ScreenCaptureResults captureResults = captureListener->waitForResults(); - if (captureResults.result != NO_ERROR) { + if (!captureResults.fenceResult.ok()) { close(fd); return 1; } diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index bc299fd0f1fe7..e64b2615e1e27 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -314,12 +314,12 @@ public: 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 =