diff options
| author | Eric Laurent <elaurent@google.com> | 2015-12-09 11:52:24 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-09 11:52:24 -0800 |
| commit | befe610a877c3b150a6dd90cf358df4945b8f9a6 (patch) | |
| tree | a4793f8fd898445a4c1a2decfa63118d6a1e24ef | |
| parent | b14d76b8cb245d3db231e46873cd767736727619 (diff) | |
| parent | ffa7f347525d9f4c705e753908c55fe75af0560f (diff) | |
| download | android_hardware_qcom_audio-befe610a877c3b150a6dd90cf358df4945b8f9a6.tar.gz android_hardware_qcom_audio-befe610a877c3b150a6dd90cf358df4945b8f9a6.tar.bz2 android_hardware_qcom_audio-befe610a877c3b150a6dd90cf358df4945b8f9a6.zip | |
post proc : volume listener : fix effect release crash am: ebbb823651
am: ffa7f34752
* commit 'ffa7f347525d9f4c705e753908c55fe75af0560f':
post proc : volume listener : fix effect release crash
| -rw-r--r-- | post_proc/volume_listener.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/post_proc/volume_listener.c b/post_proc/volume_listener.c index 34954bbc..ef632993 100644 --- a/post_proc/volume_listener.c +++ b/post_proc/volume_listener.c @@ -688,20 +688,31 @@ static int vol_prc_lib_release(effect_handle_t handle) struct listnode *node, *temp_node_next; vol_listener_context_t *context = NULL; vol_listener_context_t *recv_contex = (vol_listener_context_t *)handle; - int status = -1; + int status = -EINVAL; bool recompute_flag = false; int active_stream_count = 0; + uint32_t session_id; + uint32_t stream_type; + effect_uuid_t uuid; + ALOGV("%s context %p", __func__, handle); + + if (recv_contex == NULL) { + return status; + } pthread_mutex_lock(&vol_listner_init_lock); + session_id = recv_contex->session_id; + stream_type = recv_contex->stream_type; + uuid = recv_contex->desc->uuid; // check if the handle/context provided is valid list_for_each_safe(node, temp_node_next, &vol_effect_list) { context = node_to_item(node, struct vol_listener_context_s, effect_list_node); - if ((memcmp(&(context->desc->uuid), &(recv_contex->desc->uuid), sizeof(effect_uuid_t)) == 0) - && (context->session_id == recv_contex->session_id) - && (context->stream_type == recv_contex->stream_type)) { + if ((memcmp(&(context->desc->uuid), &uuid, sizeof(effect_uuid_t)) == 0) + && (context->session_id == session_id) + && (context->stream_type == stream_type)) { ALOGV("--- Found something to remove ---"); - list_remove(&context->effect_list_node); + list_remove(node); PRINT_STREAM_TYPE(context->stream_type); if (context->dev_id == AUDIO_DEVICE_OUT_SPEAKER) { recompute_flag = true; @@ -715,6 +726,8 @@ static int vol_prc_lib_release(effect_handle_t handle) if (status != 0) { ALOGE("something wrong ... <<<--- Found NOTHING to remove ... ???? --->>>>>"); + pthread_mutex_unlock(&vol_listner_init_lock); + return status; } // if there are no active streams, reset cal and volume level |