Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use FenceResult in ScreenCaptureResults"

Browse Source
This commit is contained in:
Patrick Williams
2022-08-26 18:33:01 +00:00
committed by Android (Google) Code Review
parent 3e5d6fbd70 8d45572758
commit 1047e4bf0b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/screencap/screencap.cpp
View File

@@ -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;
}

4
core/jni/android_view_SurfaceControl.cpp
View File

@@ -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 =