diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-08 08:34:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-08 08:34:33 -0800 |
| commit | 1e3a8d3090f2a33562201f95f736949a8d2df576 (patch) | |
| tree | 01ab0e142e205a6ca799d22ad6e86a771f084e2e /media | |
| parent | cbe8b722479c7777c1ada27a898cefa47c1acdc7 (diff) | |
| parent | 4b80abcdd5e28deb6991bd50a208b66162f90024 (diff) | |
| download | frameworks_base-1e3a8d3090f2a33562201f95f736949a8d2df576.zip frameworks_base-1e3a8d3090f2a33562201f95f736949a8d2df576.tar.gz frameworks_base-1e3a8d3090f2a33562201f95f736949a8d2df576.tar.bz2 | |
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 13 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 10 |
2 files changed, 0 insertions, 23 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index c96bc76..b74b3e3 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -293,7 +293,6 @@ status_t AudioRecord::start() return WOULD_BLOCK; } } - t->mLock.lock(); } AutoMutex lock(mLock); @@ -334,10 +333,6 @@ status_t AudioRecord::start() } } - if (t != 0) { - t->mLock.unlock(); - } - return ret; } @@ -347,10 +342,6 @@ status_t AudioRecord::stop() ALOGV("stop"); - if (t != 0) { - t->mLock.lock(); - } - AutoMutex lock(mLock); if (mActive == 1) { mActive = 0; @@ -367,10 +358,6 @@ status_t AudioRecord::stop() } } - if (t != 0) { - t->mLock.unlock(); - } - return NO_ERROR; } diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 233cf75..087d7b2 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -345,7 +345,6 @@ void AudioTrack::start() return; } } - t->mLock.lock(); } AutoMutex lock(mLock); @@ -396,9 +395,6 @@ void AudioTrack::start() } } - if (t != 0) { - t->mLock.unlock(); - } } void AudioTrack::stop() @@ -406,9 +402,6 @@ void AudioTrack::stop() sp<AudioTrackThread> t = mAudioTrackThread; ALOGV("stop %p", this); - if (t != 0) { - t->mLock.lock(); - } AutoMutex lock(mLock); if (mActive) { @@ -434,9 +427,6 @@ void AudioTrack::stop() } } - if (t != 0) { - t->mLock.unlock(); - } } bool AudioTrack::stopped() const |