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

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

Merge "audioflinger: Fix for a deadlock in track creation"

parents 2a16afb8 03e9e83c

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ sp<IAudioTrack> AudioFlinger::createTrack( 


        track = thread->createTrack_l(client, streamType, sampleRate, format,

                channelMask, frameCount, sharedBuffer, lSessionId, flags, tid, clientUid, &lStatus);

        LOG_ALWAYS_FATAL_IF((track != 0) != (lStatus == NO_ERROR));

        LOG_ALWAYS_FATAL_IF((lStatus == NO_ERROR) && (track == 0));

        // we don't abort yet if lStatus != NO_ERROR; there is still work to be done regardless



        // move effect chain to this output thread if an effect on same session was waiting
@@ -1340,7 +1340,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( 
                                                  frameCount, lSessionId,

                                                  IPCThreadState::self()->getCallingUid(),

                                                  flags, tid, &lStatus);

        LOG_ALWAYS_FATAL_IF((recordTrack != 0) != (lStatus == NO_ERROR));

        LOG_ALWAYS_FATAL_IF((lStatus == NO_ERROR) && (recordTrack == 0));

    }



    if (lStatus != NO_ERROR) {

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac 
        lStatus = track != 0 ? track->initCheck() : (status_t) NO_MEMORY;

        if (lStatus != NO_ERROR) {

            ALOGE("createTrack_l() initCheck failed %d; no control block?", lStatus);

            track.clear();

            // track must be cleared from the caller as the caller has the AF lock

            goto Exit;

        }
@@ -4863,7 +4863,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe 
        lStatus = track->initCheck();

        if (lStatus != NO_ERROR) {

            ALOGE("createRecordTrack_l() initCheck failed %d; no control block?", lStatus);

            track.clear();

            // track must be cleared from the caller as the caller has the AF lock

            goto Exit;

        }

        mTracks.add(track);