summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-05-18 23:18:24 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-05-18 23:18:24 +0000
commit141aa95bf649e5728f7b49ca8146445a392b386f (patch)
tree0f211f91aa71600440fd4837b5c11122e321c20e
parentc8ea9d6a670b75b7e8510b2d04e184e141f431e3 (diff)
parent43b3772b83df40bb49e29abbd58cc07e51e55ca3 (diff)
downloadandroid_hardware_qcom_audio-141aa95bf649e5728f7b49ca8146445a392b386f.tar.gz
android_hardware_qcom_audio-141aa95bf649e5728f7b49ca8146445a392b386f.tar.bz2
android_hardware_qcom_audio-141aa95bf649e5728f7b49ca8146445a392b386f.zip
Snap for 5582435 from 43b3772b83df40bb49e29abbd58cc07e51e55ca3 to qt-qpr1-release
Change-Id: I5e5d122e2ef05f1890ad8c2758d0a03ab6d99e00
-rw-r--r--hal/audio_hw.c6
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) {