summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/Tracks.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-07-29 14:27:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-29 14:27:56 +0000
commitafbbc6c5f6bc470d504dcf24ceb3ac21d57fb78d (patch)
tree6fc44421938fc9a08c232580f581b89f95259ed3 /services/audioflinger/Tracks.cpp
parent420ea49539d23ab305a7b33c0854a7a475493dd4 (diff)
parenta8356f663014e7d4c27869629af83d8bb3441e19 (diff)
downloadframeworks_av-afbbc6c5f6bc470d504dcf24ceb3ac21d57fb78d.zip
frameworks_av-afbbc6c5f6bc470d504dcf24ceb3ac21d57fb78d.tar.gz
frameworks_av-afbbc6c5f6bc470d504dcf24ceb3ac21d57fb78d.tar.bz2
Merge "Simplify RecordTrack::stop()"
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
-rw-r--r--services/audioflinger/Tracks.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index 75ffcc2..52518ae 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -1705,12 +1705,7 @@ void AudioFlinger::RecordThread::RecordTrack::stop()
sp<ThreadBase> thread = mThread.promote();
if (thread != 0) {
RecordThread *recordThread = (RecordThread *)thread.get();
- recordThread->mLock.lock();
- bool doStop = recordThread->stop_l(this);
- if (doStop) {
- }
- recordThread->mLock.unlock();
- if (doStop) {
+ if (recordThread->stop(this)) {
AudioSystem::stopInput(recordThread->id());
}
}