commit cc2165840d524bb9553f9d73d1904633d20100a2
author Phil Burk <philburk@google.com> Thu Apr 15 23:40:25 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Aug 14 00:58:16 2021 +0000
tree 0b7f31129ab3cbef683431324b24a9ab8130f955
parent 084077feb6b8c961adcbe77b2bd76601ca54e534

aaudio: unlock when joining the timestamp thread

This will prevent a deadlock in case the timestamp
thread tries to acquire the same lock.

Bug: 182852602
Bug: 153358911
Test: plug and unplug headphones while playing
Change-Id: I625d191906c7e280f3a223f476716ef17b9098ea
Merged-In: I625d191906c7e280f3a223f476716ef17b9098ea
(cherry picked from commit 5f6fda778bf35be4cd67363ca0fe40cf710364c3)

services/oboeservice/AAudioServiceStreamBase.cpp

diff --git a/services/oboeservice/AAudioServiceStreamBase.cpp b/services/oboeservice/AAudioServiceStreamBase.cpp
index 32cc7ca..30deb5d 100644
--- a/services/oboeservice/AAudioServiceStreamBase.cpp
+++ b/services/oboeservice/AAudioServiceStreamBase.cpp
@@ -338,7 +338,12 @@
 
     setState(AAUDIO_STREAM_STATE_STOPPING);
 
+    // Temporarily unlock because we are joining the timestamp thread and it may try
+    // to acquire mLock.
+    mLock.unlock();
     result = stopTimestampThread();
+    mLock.lock();
+
     if (result != AAUDIO_OK) {
         disconnect_l();
         return result;