diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-09-18 12:56:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-18 12:56:43 -0700 |
| commit | 6a3ac72507af9abb12d7bbb9f16b93e6c8ec650f (patch) | |
| tree | 027e9528687fdeb1350ca5ab834e827f3e2b259d /audio | |
| parent | 9880c1af31c1be202fdb50214a481205f714a26e (diff) | |
| parent | 56c8d101b1a7b6660ce4f2504ee24a7c78eb19b1 (diff) | |
| download | device_samsung_tuna-6a3ac72507af9abb12d7bbb9f16b93e6c8ec650f.zip device_samsung_tuna-6a3ac72507af9abb12d7bbb9f16b93e6c8ec650f.tar.gz device_samsung_tuna-6a3ac72507af9abb12d7bbb9f16b93e6c8ec650f.tar.bz2 | |
Merge "audio: defer ril acoustic call until after modem PCM is open" into ics-factoryrom
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index a605387..fe0a187 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -478,6 +478,7 @@ static void select_input_device(struct tuna_audio_device *adev); static int adev_set_voice_volume(struct audio_hw_device *dev, float volume); static int do_input_standby(struct tuna_stream_in *in); static int do_output_standby(struct tuna_stream_out *out); +static void set_incall_device(struct tuna_audio_device *adev); /* Returns true on devices that must use sidetone capture, * false otherwise. */ @@ -551,6 +552,8 @@ static int start_call(struct tuna_audio_device *adev) pcm_start(adev->pcm_modem_dl); pcm_start(adev->pcm_modem_ul); + set_incall_device(adev); + return 0; err_open_dl: @@ -807,8 +810,6 @@ static void select_output_device(struct tuna_audio_device *adev) /* enable sidetone mixer capture if needed */ sidetone_capture_on = earpiece_on && adev->sidetone_capture; } - - set_incall_device(adev); } mixer_ctl_set_value(adev->mixer_ctls.sidetone_capture, 0, sidetone_capture_on); |