commit 640a31f8814c9f2b91f03bee871ef170b535b10b
author qctecmdr <qctecmdr@localhost> Tue Sep 17 02:17:25 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 17 02:17:25 2019 -0700
tree 8354d5a6d0a2ffa005baaa6d3cc5a1b6839165db
parent f465a6277c7ae60fcb2805113b02bf33eaf28625
parent c576a455900013b375acd1edf694760ef5629381

Merge "hal: tear down a2dp path for non-offloaded streams when suspended"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 35324ef..8366f24 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -9598,11 +9598,10 @@
             pthread_mutex_unlock(&out->compr_mute_lock);
         }
     } else {
-        // mute compress stream if suspended
-        pthread_mutex_lock(&out->compr_mute_lock);
-        if ((out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) &&
-            (!out->a2dp_compress_mute)) {
-            if (!out->standby) {
+        if (out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) {
+            // mute compress stream if suspended
+            pthread_mutex_lock(&out->compr_mute_lock);
+            if (!out->a2dp_compress_mute && !out->standby) {
                 ALOGD("%s: selecting speaker and muting stream", __func__);
                 devices = out->devices;
                 out->devices = AUDIO_DEVICE_OUT_SPEAKER;
@@ -9619,8 +9618,12 @@
                 out->volume_l = left_p;
                 out->volume_r = right_p;
             }
+            pthread_mutex_unlock(&out->compr_mute_lock);
+        } else {
+            // tear down a2dp path for non offloaded streams
+            if (audio_extn_a2dp_source_is_suspended())
+                out_standby_l(&out->stream.common);
         }
-        pthread_mutex_unlock(&out->compr_mute_lock);
     }
     ALOGV("%s: exit", __func__);
     return 0;