diff options
| author | Robert Lee <lerobert@google.com> | 2019-05-15 16:07:44 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 16:07:44 -0700 |
| commit | 43b3772b83df40bb49e29abbd58cc07e51e55ca3 (patch) | |
| tree | 0f211f91aa71600440fd4837b5c11122e321c20e | |
| parent | bde007c7f0eff9eabee68e7819d0a8c9ae844285 (diff) | |
| parent | de49eecf02f552df911bccc2f553e08e0bf4d212 (diff) | |
| download | android_hardware_qcom_audio-43b3772b83df40bb49e29abbd58cc07e51e55ca3.tar.gz android_hardware_qcom_audio-43b3772b83df40bb49e29abbd58cc07e51e55ca3.tar.bz2 android_hardware_qcom_audio-43b3772b83df40bb49e29abbd58cc07e51e55ca3.zip | |
Merge "audio: fix resume music not smooth after press end call with touch sound" into qt-dev
am: de49eecf02
Change-Id: I6813b53e094d15b4a1df954593d3a49470cf7030
| -rw-r--r-- | hal/audio_hw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c index e0c2fce6..b15bde77 100644 --- a/hal/audio_hw.c +++ b/hal/audio_hw.c @@ -2207,8 +2207,6 @@ static int stop_output_stream(struct stream_out *out) int i, ret = 0; struct audio_usecase *uc_info; struct audio_device *adev = out->dev; - bool has_voip_usecase = - get_usecase_from_list(adev, USECASE_AUDIO_PLAYBACK_VOIP) != NULL; ALOGV("%s: enter: usecase(%d: %s)", __func__, out->usecase, use_case_table[out->usecase]); @@ -2258,8 +2256,8 @@ static int stop_output_stream(struct stream_out *out) speaker when voip stops. 2) trigger voip input to reroute when voip output changes to hearing aid. */ - if (has_voip_usecase || - out->devices & AUDIO_DEVICE_OUT_SPEAKER_SAFE) { + if (out->usecase == USECASE_AUDIO_PLAYBACK_VOIP || + out->devices & AUDIO_DEVICE_OUT_SPEAKER_SAFE) { struct listnode *node; struct audio_usecase *usecase; list_for_each(node, &adev->usecase_list) { |