| commit | 2e4fe31da66dd626dc9f9c81e683b8abc6ffa939 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Jun 07 17:02:56 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 07 17:02:56 2024 +0000 |
| tree | 61a45b3aa6eeade73f317b52b2fd35acecd24cad | |
| parent | 2422db37a01c49f7fb62b37010216e81ca80038e [diff] | |
| parent | 5a18543b7931e5e437ebafae2d821d862a0bd0c2 [diff] |
Merge "codec2: do not close handle in _C2FenceFactory::CreateFromNativeHandle" into main am: 0ab7804305 am: 5a18543b79 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3081843 Change-Id: Iaaccc6c70eefc5a2314faac41da113f49469a543 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/vndk/C2Fence.cpp b/media/codec2/vndk/C2Fence.cpp index 5d50fc3..3438406 100644 --- a/media/codec2/vndk/C2Fence.cpp +++ b/media/codec2/vndk/C2Fence.cpp
@@ -533,8 +533,7 @@ break; default: ALOGV("Unsupported fence type %d", type); - // If this is malformed-handle close the handle here. - (void) native_handle_close(handle); + // Nothing else to do. The handle is owned by the caller. // return a null-fence in this case break; }