Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d455727 authored by Patrick Williams's avatar Patrick Williams
Browse files

Use FenceResult in ScreenCaptureResults

Bug: b/232535621
Test: existing tests pass
Change-Id: Ida9e6bed0964aed97448b4cdd60a3383a0c56b62
parent a6fae494
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;
    }
+2 −2
Original line number Diff line number Diff line
@@ -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 =