| commit | 28835a324a7c66a2710147695871717b997aac6a | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Mon Apr 24 19:08:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 24 19:08:54 2023 +0000 |
| tree | 31baf1310f7a7029132750aa8c21b931cae46d12 | |
| parent | d8cd71bb520bbe9c45f00da587abb333f216fa96 [diff] | |
| parent | 0941f6e1bc82870a49af83be00d6d7ada40f85c7 [diff] |
PatchPanel: fix deadlock when releasing a patch am: 34e55a460c am: 0941f6e1bc Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22813518 Change-Id: Icfcb94922c96e876c4849a123d7428d9a36033d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libeffects/spatializer/benchmarks/spatializer_benchmark.cpp b/media/libeffects/spatializer/benchmarks/spatializer_benchmark.cpp index e8ac480..e2177db 100644 --- a/media/libeffects/spatializer/benchmarks/spatializer_benchmark.cpp +++ b/media/libeffects/spatializer/benchmarks/spatializer_benchmark.cpp
@@ -31,6 +31,7 @@ (audio_effect_library_t*)dlsym(effectLib, AUDIO_EFFECT_LIBRARY_INFO_SYM_AS_STR); if (effectInterface == nullptr) { ALOGE("dlsym failed: %s", dlerror()); + dlclose(effectLib); exit(-1); } symbol = (audio_effect_library_t)(*effectInterface);
diff --git a/media/libeffects/spatializer/tests/SpatializerTest.cpp b/media/libeffects/spatializer/tests/SpatializerTest.cpp index 110fbb1..3db42b6 100644 --- a/media/libeffects/spatializer/tests/SpatializerTest.cpp +++ b/media/libeffects/spatializer/tests/SpatializerTest.cpp
@@ -30,6 +30,7 @@ (audio_effect_library_t*)dlsym(effectLib, AUDIO_EFFECT_LIBRARY_INFO_SYM_AS_STR); if (effectInterface == nullptr) { ALOGE("dlsym failed: %s", dlerror()); + dlclose(effectLib); exit(-1); } symbol = (audio_effect_library_t)(*effectInterface);