Merge "audio: fix resume music not smooth after press end call with touch sound" into qt-dev
am: de49eecf02

Change-Id: I6813b53e094d15b4a1df954593d3a49470cf7030
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index e0c2fce..b15bde7 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2207,8 +2207,6 @@
     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 @@
           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) {