commit e260f5a3bcec164636d4cf780d26a4227a7e7234
author Atneya Nair <atneya@google.com> Tue May 03 17:02:20 2022 -0400
committer Atneya Nair <atneya@google.com> Wed May 04 15:11:30 2022 -0400
tree e0bb08546569ff31e08ac7fdff5429f6b96ea485
parent 688cec6e7adb88f3a121ab94d5aaa9ecd9a0d312

Properly unlock on return in process thread

There is a return path in processAudioBuffer that did not
properly drop AudioTrack/AudioRecord object locks, leading
to deadlocks, which were only triggered upon certain lifetime
races.

Test: atest AudioTrackTest, atest AudioRecordTest
Bug: 230312538
Change-Id: I1d48061eca67ef7d5908ae8bd5186cbb3598f149

media/libaudioclient/AudioTrack.cpp

diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index bec6b10..36f8e10 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -2448,6 +2448,7 @@
     sp<IAudioTrackCallback> callback = mCallback.promote();
     if (!callback) {
         mCallback = nullptr;
+        mLock.unlock();
         return NS_NEVER;
     }
     if (mAwaitBoost) {