Merge "Use consistent style of & reference for AutoMutex"

This commit is contained in:
Glenn Kasten
2012-01-11 10:23:04 -08:00
committed by Android (Google) Code Review

View File

@@ -1011,7 +1011,7 @@ void AudioFlinger::ThreadBase::exit()
ALOGV("ThreadBase::exit");
{
AutoMutex lock(&mLock);
AutoMutex lock(mLock);
mExiting = true;
requestExit();
mWaitWorkCV.signal();
@@ -4505,7 +4505,7 @@ status_t AudioFlinger::RecordThread::start(RecordThread::RecordTrack* recordTrac
sp <ThreadBase> strongMe = this;
status_t status = NO_ERROR;
{
AutoMutex lock(&mLock);
AutoMutex lock(mLock);
if (mActiveTrack != 0) {
if (recordTrack != mActiveTrack.get()) {
status = -EBUSY;
@@ -4557,7 +4557,7 @@ void AudioFlinger::RecordThread::stop(RecordThread::RecordTrack* recordTrack) {
ALOGV("RecordThread::stop");
sp <ThreadBase> strongMe = this;
{
AutoMutex lock(&mLock);
AutoMutex lock(mLock);
if (mActiveTrack != 0 && recordTrack == mActiveTrack.get()) {
mActiveTrack->mState = TrackBase::PAUSING;
// do not wait for mStartStopCond if exiting