Merge "Reset fenceFd without calling close on it"

2022-09-14 21:10:06 +00:00
parent a114ebddfa 1165c90081
commit 07b5ffb256
1 changed files with 1 additions and 1 deletions
--- a/media/jni/android_media_ImageWriter.cpp
+++ b/media/jni/android_media_ImageWriter.cpp
@@ -1014,7 +1014,7 @@ static void Image_getLockedImage(JNIEnv* env, jobject thiz, LockedImage *image)
    status_t res = lockImageFromBuffer(
            buffer, GRALLOC_USAGE_SW_WRITE_OFTEN, noCrop, fenceFd, image);
    // Clear the fenceFd as it is already consumed by lock call.
-    Image_setFenceFd(env, thiz, /*fenceFd*/-1);
+    env->SetIntField(thiz, gSurfaceImageClassInfo.mNativeFenceFd, -1);
    if (res != OK) {
        jniThrowExceptionFmt(env, "java/lang/RuntimeException",
                "lock buffer failed for format 0x%x",