summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-11-09 18:03:33 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-11-09 18:03:33 -0800
commit040a7e7fdd6bd6fa7975bae257a62d0c70fa37ff (patch)
tree89d8fa0d3148b56f8e5baccb326470bae1f9ed1e
parente5dcb2888fb9b132d70f01ef2f0d2794964c9cbf (diff)
parent8a99de28d8322fdd50caec5cc2115c32093bc7d9 (diff)
downloadandroid_hardware_qcom_audio-040a7e7fdd6bd6fa7975bae257a62d0c70fa37ff.tar.gz
android_hardware_qcom_audio-040a7e7fdd6bd6fa7975bae257a62d0c70fa37ff.tar.bz2
android_hardware_qcom_audio-040a7e7fdd6bd6fa7975bae257a62d0c70fa37ff.zip
Merge "hal: Fix device selection at start of the voice call"
-rw-r--r--hal/audio_hw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 6a52e603..c78bc981 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1939,9 +1939,6 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
if (val != 0) {
out->devices = val;
- if (!out->standby)
- select_devices(adev, out->usecase);
-
if (output_drives_call(adev, out)) {
if(!voice_is_in_call(adev)) {
if (adev->mode == AUDIO_MODE_IN_CALL) {
@@ -1953,6 +1950,9 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
voice_update_devices_for_all_voice_usecases(adev);
}
}
+
+ if (!out->standby)
+ select_devices(adev, out->usecase);
}
pthread_mutex_unlock(&adev->lock);