commit 8e60dbc28f1f4b5ca9617032e0477dd1b5d8c8d7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 11 18:29:22 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 11 18:29:22 2019 +0000
tree a00f9a78ab0fe7c058302ca3eaec377895ee2bac
parent ce078623ef075cfa6377c8e2b94696985913bdb1
parent 8711cfda98b1a2ab421b2a7792866681b363c1c2

Merge "audio HAL wrapper: createAudioPatch handle reuse"

media/libaudiohal/impl/DeviceHalHidl.cpp

diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp
index b25f82e..b07f21d 100644
--- a/media/libaudiohal/impl/DeviceHalHidl.cpp
+++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
@@ -322,6 +322,14 @@
         const struct audio_port_config *sinks,
         audio_patch_handle_t *patch) {
     if (mDevice == 0) return NO_INIT;
+    if (patch == nullptr) return BAD_VALUE;
+
+    if (*patch != AUDIO_PATCH_HANDLE_NONE) {
+        status_t status = releaseAudioPatch(*patch);
+        ALOGW_IF(status != NO_ERROR, "%s error %d releasing patch handle %d",
+            __func__, status, *patch);
+    }
+
     hidl_vec<AudioPortConfig> hidlSources, hidlSinks;
     HidlUtils::audioPortConfigsFromHal(num_sources, sources, &hidlSources);
     HidlUtils::audioPortConfigsFromHal(num_sinks, sinks, &hidlSinks);