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

Commit f4fe6c9f authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

Merge "Move sync_wait for screen capture to client" into sc-dev am: 6dce7b86 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13424549

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02487e0eb8a7c29e70a0f6dc558782b53cd15e21
parents a63de17d 6dce7b86

core/jni/android_view_SurfaceControl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ public: 
        }

    }



    binder::Status onScreenCaptureComplete(

    binder::Status onScreenCaptureCompleted(

            const gui::ScreenCaptureResults& captureResults) override {

        JNIEnv* env = getenv();

        if (captureResults.result != NO_ERROR || captureResults.buffer == nullptr) {
@@ -270,6 +270,7 @@ public: 
                                gScreenCaptureListenerClassInfo.onScreenCaptureComplete, nullptr);

            return binder::Status::ok();

        }

        captureResults.fence->waitForever("");

        jobject jhardwareBuffer = android_hardware_HardwareBuffer_createFromAHardwareBuffer(

                env, captureResults.buffer->toAHardwareBuffer());

        const jint namedColorSpace =