diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-09-21 16:34:45 -0700 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2011-09-21 22:03:17 -0700 |
| commit | 42859b81397d56dacb5d7d1bd696f6882a72410a (patch) | |
| tree | 96757a059b14ae8c24f5085b33410f9439c61aa5 /audio | |
| parent | d0cf64c6d4362eee312cc36838e95002d30ffbae (diff) | |
| download | device_samsung_tuna-42859b81397d56dacb5d7d1bd696f6882a72410a.zip device_samsung_tuna-42859b81397d56dacb5d7d1bd696f6882a72410a.tar.gz device_samsung_tuna-42859b81397d56dacb5d7d1bd696f6882a72410a.tar.bz2 | |
audio: don't tear down modem PCMs for route change
Fixes bug 5278856
Change-Id: I25bdae020241c2388db298637d111fba1c3acecd
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index ead714a..47e3ff7 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -750,11 +750,6 @@ static void select_output_device(struct tuna_audio_device *adev) int dl1_on; int sidetone_capture_on = 0; - /* tear down call stream before changing route, - otherwise microphone does not function */ - if (adev->in_call) - end_call(adev); - headset_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADSET; headphone_on = adev->devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE; speaker_on = adev->devices & AUDIO_DEVICE_OUT_SPEAKER; @@ -859,9 +854,6 @@ static void select_output_device(struct tuna_audio_device *adev) } mixer_ctl_set_value(adev->mixer_ctls.sidetone_capture, 0, sidetone_capture_on); - - if (adev->in_call) - start_call(adev); } static void select_input_device(struct tuna_audio_device *adev) @@ -884,12 +876,6 @@ static void select_input_device(struct tuna_audio_device *adev) } } - /* tear down call stream before changing route, - * otherwise microphone does not function - */ - if (adev->in_call) - end_call(adev); - /* TODO: check how capture is possible during voice calls or if * both use cases are mutually exclusive. */ @@ -913,9 +899,6 @@ static void select_input_device(struct tuna_audio_device *adev) } set_input_volumes(adev, main_mic_on, headset_on, sub_mic_on); - - if (adev->in_call) - start_call(adev); } /* must be called with hw device and output stream mutexes locked */ |