commit 425180d04b405123cbdfc14c37029419923da369
author Weiyin Jiang <wjiang@codeaurora.org> Mon Jun 05 16:40:23 2017 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 07 19:48:00 2017 -0700
tree f24d08075d3480a5b29fa3956a2e41e5f7a949f2
parent b4288b8e009a6142e2fe71e917912deedde2b650

audio: follow routine lock order to avoid deadlock

Inconsistent locking order leads to potential deadlock, follow the
sequence that adev lock to be acquired after stream lock to resolve
such scenario.

CRs-Fixed: 2056285
Change-Id: If7d9384dcf862e5a504df4ad55c8fa8ce7d8a113

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 1013332..4effefa 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -4663,7 +4663,10 @@
             if ((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);
                 //force device switch to re configure encoder
                 select_devices(adev, usecase->id);