diff options
| author | Dave Burke <daveburke@google.com> | 2012-10-18 18:13:37 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-10-18 18:23:52 -0700 |
| commit | 786a53720cff310032e2ddef7756e7d9d08e6a34 (patch) | |
| tree | bf0f47848a330918eece8f756ab9cf51eb687f4c | |
| parent | 73df78f5b4a2ec2b15c9d2f794e6d817a0ea9a37 (diff) | |
| download | audio-786a53720cff310032e2ddef7756e7d9d08e6a34.tar.gz | |
Revert "alsa_sound: change voice-call stop sequence"
This reverts commit 0f5426b31b9a15743e4621a972cccafc4087aa62
Change-Id: I09e3d3cf17c1d775c76e2f8f6276216fbaa9ac92
| -rw-r--r-- | alsa_sound/alsa_default.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/alsa_sound/alsa_default.cpp b/alsa_sound/alsa_default.cpp index 40d575c..18a28d2 100644 --- a/alsa_sound/alsa_default.cpp +++ b/alsa_sound/alsa_default.cpp @@ -1088,21 +1088,6 @@ static status_t s_close(alsa_handle_t *handle) handle->rxHandle = 0; ALOGV("s_close: handle %p h %p", handle, h); if (h) { - if ((!strcmp(handle->useCase, SND_USE_CASE_VERB_VOICECALL) || - !strcmp(handle->useCase, SND_USE_CASE_MOD_PLAY_VOICE)) && - platform_is_Fusion3()) { -#ifdef QCOM_CSDCLIENT_ENABLED - if (csd_stop_voice == NULL) { - ALOGE("dlsym:Error:%s Loading csd_client_disable_device", dlerror()); - } else { - err = csd_stop_voice(); - if (err < 0) { - ALOGE("s_close: csd_client error %d\n", err); - } - } -#endif - } - ALOGV("s_close rxHandle\n"); err = pcm_close(h); if(err != NO_ERROR) { @@ -1120,6 +1105,21 @@ static status_t s_close(alsa_handle_t *handle) ALOGE("s_close: pcm_close failed for handle with err %d", err); } + if ((!strcmp(handle->useCase, SND_USE_CASE_VERB_VOICECALL) || + !strcmp(handle->useCase, SND_USE_CASE_MOD_PLAY_VOICE)) && + platform_is_Fusion3()) { +#ifdef QCOM_CSDCLIENT_ENABLED + if (csd_stop_voice == NULL) { + ALOGE("dlsym:Error:%s Loading csd_client_disable_device", dlerror()); + } else { + err = csd_stop_voice(); + if (err < 0) { + ALOGE("s_close: csd_client error %d\n", err); + } + } +#endif + } + disableDevice(handle); } else if((!strcmp(handle->useCase, SND_USE_CASE_VERB_HIFI_LOW_POWER)) || (!strcmp(handle->useCase, SND_USE_CASE_MOD_PLAY_LPA)) || |