diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-09-13 14:14:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-13 14:14:46 -0700 |
| commit | 01ecfa58f014921b7cc95e7402aeb31b03f992d0 (patch) | |
| tree | 68436148c825f882c7f13eb95636966d5943e22b /audio | |
| parent | dc259fcca9d55e88ac04a7fda0cfa1e900e85937 (diff) | |
| parent | 164274d50c1e1e7ed23f0a81e1fbdb5ec59aa35f (diff) | |
| download | device_samsung_tuna-01ecfa58f014921b7cc95e7402aeb31b03f992d0.zip device_samsung_tuna-01ecfa58f014921b7cc95e7402aeb31b03f992d0.tar.gz device_samsung_tuna-01ecfa58f014921b7cc95e7402aeb31b03f992d0.tar.bz2 | |
Merge "audio: don't clear output devices at standby"
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 8d7a11f..45ece23 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -877,8 +877,6 @@ static int start_output_stream(struct tuna_stream_out *out) if (adev->mode != AUDIO_MODE_IN_CALL) { /* FIXME: only works if only one output can be active at a time */ - adev->devices &= ~AUDIO_DEVICE_OUT_ALL; - adev->devices |= out->device; select_output_device(adev); } @@ -1077,7 +1075,6 @@ static int do_output_standby(struct tuna_stream_out *out) be done when the call is ended */ if (adev->mode != AUDIO_MODE_IN_CALL) { /* FIXME: only works if only one output can be active at a time */ - adev->devices &= ~AUDIO_DEVICE_OUT_ALL; set_route_by_array(adev->mixer, hs_output, 0); set_route_by_array(adev->mixer, hf_output, 0); } |