Close the handle returned by WrapNativeCodec2GrallocHandle()
At ag/13824423 we fixed the description of
WrapNativeCodec2GrallocHandle() that the returned handle should be
closed and deleted. This CL closes and deletes the handle if the
ownership of the returned handle is not transfered to
C2GraphicAllocation successfully.
Bug: 181541291
Test: android.media.cts.AdaptivePlaybackTest
Change-Id: I18464f860a93a750db653eb615ae0c92a672535e
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 1870a93..7f5dd5d 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -2260,6 +2260,8 @@
c2_status_t c2err = sGrallocAlloc->priorGraphicAllocation(handle, &alloc);
if (c2err != C2_OK) {
ALOGW("Failed to wrap AHardwareBuffer into C2GraphicAllocation");
+ native_handle_close(handle);
+ native_handle_delete(handle);
throwExceptionAsNecessary(env, BAD_VALUE);
return;
}