summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-07-28 13:59:02 -0700
committerThe Android Automerger <android-build@android.com>2011-07-29 11:45:59 -0700
commit0f33feef678c3c1f6304cb116ffcd5ab849dc3df (patch)
tree54dcc4237e87c8782c697cd338a6bbbed78e2758
parenta3924af33a8005a0aeb20b97fd06e0c523b0d1af (diff)
downloadframeworks_av-0f33feef678c3c1f6304cb116ffcd5ab849dc3df.zip
frameworks_av-0f33feef678c3c1f6304cb116ffcd5ab849dc3df.tar.gz
frameworks_av-0f33feef678c3c1f6304cb116ffcd5ab849dc3df.tar.bz2
Fix issue 5090721: audio record broken
Commit 6dbdc40 introduced a deadlock when exiting the AudioFlinger RecordThread. Change-Id: I1f63e54c5aeff05da4e4d028b53f734c62c78677
-rw-r--r--services/audioflinger/AudioFlinger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 4e068b2..ec45530 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1100,7 +1100,7 @@ void AudioFlinger::ThreadBase::acquireWakeLock_l()
void AudioFlinger::ThreadBase::releaseWakeLock()
{
Mutex::Autolock _l(mLock);
- releaseWakeLock();
+ releaseWakeLock_l();
}
void AudioFlinger::ThreadBase::releaseWakeLock_l()