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

Commit 136ab28f authored by Phil Burk's avatar Phil Burk Committed by Automerger Merge Worker
Browse files

aaudio: prevent deadlock when stop() calls disconnect() am: 347fcbb4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15014350

Change-Id: I0c627564536832c8f1ee7fb855b0d6bd131b082d
parents b36cd60c 347fcbb4

services/oboeservice/AAudioServiceStreamBase.cpp

+7 −8
Original line number Diff line number Diff line
@@ -227,10 +227,6 @@ aaudio_result_t AAudioServiceStreamBase::pause_l() { 
        return result;

    }



    // Send it now because the timestamp gets rounded up when stopStream() is called below.

    // Also we don't need the timestamps while we are shutting down.

    sendCurrentTimestamp();



    result = stopTimestampThread();

    if (result != AAUDIO_OK) {

        disconnect_l();
@@ -266,9 +262,6 @@ aaudio_result_t AAudioServiceStreamBase::stop_l() { 


    setState(AAUDIO_STREAM_STATE_STOPPING);



    // Send it now because the timestamp gets rounded up when stopStream() is called below.

    // Also we don't need the timestamps while we are shutting down.

    sendCurrentTimestamp(); // warning - this calls a virtual function

    result = stopTimestampThread();

    if (result != AAUDIO_OK) {

        disconnect_l();
@@ -324,10 +317,11 @@ void AAudioServiceStreamBase::run() { 
    timestampScheduler.start(AudioClock::getNanoseconds());

    int64_t nextTime = timestampScheduler.nextAbsoluteTime();

    int32_t loopCount = 0;

    aaudio_result_t result = AAUDIO_OK;

    while(mThreadEnabled.load()) {

        loopCount++;

        if (AudioClock::getNanoseconds() >= nextTime) {

            aaudio_result_t result = sendCurrentTimestamp();

            result = sendCurrentTimestamp();

            if (result != AAUDIO_OK) {

                ALOGE("%s() timestamp thread got result = %d", __func__, result);

                break;
@@ -339,6 +333,11 @@ void AAudioServiceStreamBase::run() { 
            AudioClock::sleepUntilNanoTime(nextTime);

        }

    }

    // This was moved from the calls in stop_l() and pause_l(), which could cause a deadlock

    // if it resulted in a call to disconnect.

    if (result == AAUDIO_OK) {

        (void) sendCurrentTimestamp();

    }

    ALOGD("%s() %s exiting after %d loops <<<<<<<<<<<<<< TIMESTAMPS",

          __func__, getTypeText(), loopCount);

}