commit b606aefba535d5cf14a2175f6d4487dc52c3a1e3
author qctecmdr <qctecmdr@localhost> Wed Jul 10 03:53:16 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 10 03:53:15 2019 -0700
tree d7719b0d2976aaca4dc8f8013e1d45012b1d9757
parent b9db2553b23dab64f11c0cd79d9ab4961e15cf0c
parent f1c3b6b7291561b68137b17ae2bc95efaae48429

Merge "Audio: Avoid sudden volume hike observed during SHO."

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index edc09cc..e2ef2d3 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -8229,13 +8229,17 @@
             if (usecase->stream.out && (usecase->type == PCM_PLAYBACK) &&
                 (usecase->devices & AUDIO_DEVICE_OUT_ALL_A2DP)){
                 ALOGD("reconfigure a2dp... forcing device switch");
-
                 pthread_mutex_unlock(&adev->lock);
                 lock_output_stream(usecase->stream.out);
                 pthread_mutex_lock(&adev->lock);
                 audio_extn_a2dp_set_handoff_mode(true);
+                ALOGD("Switching to speaker and muting the stream before select_devices");
+                check_a2dp_restore_l(adev, usecase->stream.out, false);
                 //force device switch to re configure encoder
                 select_devices(adev, usecase->id);
+                ALOGD("Unmuting the stream after select_devices");
+                usecase->stream.out->a2dp_compress_mute = false;
+                out_set_compr_volume(&usecase->stream.out->stream, usecase->stream.out->volume_l, usecase->stream.out->volume_r);
                 audio_extn_a2dp_set_handoff_mode(false);
                 pthread_mutex_unlock(&usecase->stream.out->lock);
                 break;