Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afbbc6c5 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Simplify RecordTrack::stop()"

parents 420ea495 a8356f66

services/audioflinger/Threads.cpp

+2 −1
Original line number Diff line number Diff line
@@ -4588,8 +4588,9 @@ void AudioFlinger::RecordThread::handleSyncStartEvent(const sp<SyncEvent>& event 
    }

}



bool AudioFlinger::RecordThread::stop_l(RecordThread::RecordTrack* recordTrack) {

bool AudioFlinger::RecordThread::stop(RecordThread::RecordTrack* recordTrack) {

    ALOGV("RecordThread::stop");

    AutoMutex _l(mLock);

    if (recordTrack != mActiveTrack.get() || recordTrack->mState == TrackBase::PAUSING) {

        return false;

    }

services/audioflinger/Threads.h

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ public: 


            // ask the thread to stop the specified track, and

            // return true if the caller should then do it's part of the stopping process

            bool        stop_l(RecordTrack* recordTrack);

            bool        stop(RecordTrack* recordTrack);



            void        dump(int fd, const Vector<String16>& args);

            AudioStreamIn* clearInput();

services/audioflinger/Tracks.cpp

+1 −6
Original line number Diff line number Diff line
@@ -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());

        }

    }