| commit | ba41e8210b7ad03a792b685749fcfbae468396be | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Mon Apr 24 18:27:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 24 18:27:36 2023 +0000 |
| tree | 31baf1310f7a7029132750aa8c21b931cae46d12 | |
| parent | e64ff05250bdf09f4ce7d86adabb1f2ee57e8423 [diff] | |
| parent | 34e55a460c83ce5e929f864f86732f59ef39ad2f [diff] |
PatchPanel: fix deadlock when releasing a patch am: 34e55a460c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22813518 Change-Id: I0dae493c2cd994563c48aeb2e79efa0c631f8063 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);