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

Commit 5a9f95f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ie0e76781,I625d1919 into sc-dev 

* changes:
  oboeservice: separate mDisconnected from mState
  aaudio: unlock when joining the timestamp thread
parents e40fffe8 db46614d

services/oboeservice/AAudioServiceStreamBase.cpp

+9 −6
Original line number Diff line number Diff line
@@ -67,8 +67,7 @@ AAudioServiceStreamBase::~AAudioServiceStreamBase() { 
    // If the stream is deleted when OPEN or in use then audio resources will leak.

    // This would indicate an internal error. So we want to find this ASAP.

    LOG_ALWAYS_FATAL_IF(!(getState() == AAUDIO_STREAM_STATE_CLOSED

                        || getState() == AAUDIO_STREAM_STATE_UNINITIALIZED

                        || getState() == AAUDIO_STREAM_STATE_DISCONNECTED),

                        || getState() == AAUDIO_STREAM_STATE_UNINITIALIZED),

                        "service stream %p still open, state = %d",

                        this, getState());

}
@@ -229,7 +228,7 @@ aaudio_result_t AAudioServiceStreamBase::start() { 
    aaudio_result_t result = AAUDIO_OK;



    if (auto state = getState();

        state == AAUDIO_STREAM_STATE_CLOSED || state == AAUDIO_STREAM_STATE_DISCONNECTED) {

        state == AAUDIO_STREAM_STATE_CLOSED || isDisconnected_l()) {

        ALOGW("%s() already CLOSED, returns INVALID_STATE, handle = %d",

                __func__, getHandle());

        return AAUDIO_ERROR_INVALID_STATE;
@@ -342,7 +341,12 @@ aaudio_result_t AAudioServiceStreamBase::stop_l() { 


    setState(AAUDIO_STREAM_STATE_STOPPING);



    // Temporarily unlock because we are joining the timestamp thread and it may try

    // to acquire mLock.

    mLock.unlock();

    result = stopTimestampThread();

    mLock.lock();



    if (result != AAUDIO_OK) {

        disconnect_l();

        return result;
@@ -443,8 +447,7 @@ void AAudioServiceStreamBase::disconnect() { 
}



void AAudioServiceStreamBase::disconnect_l() {

    if (getState() != AAUDIO_STREAM_STATE_DISCONNECTED

        && getState() != AAUDIO_STREAM_STATE_CLOSED) {

    if (!isDisconnected_l() && getState() != AAUDIO_STREAM_STATE_CLOSED) {



        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_DISCONNECT)
@@ -452,7 +455,7 @@ void AAudioServiceStreamBase::disconnect_l() { 
            .record();



        sendServiceEvent(AAUDIO_SERVICE_EVENT_DISCONNECTED);

        setState(AAUDIO_STREAM_STATE_DISCONNECTED);

        setDisconnected_l(true);

    }

}

services/oboeservice/AAudioServiceStreamBase.h

+9 −0
Original line number Diff line number Diff line
@@ -265,6 +265,13 @@ protected: 


    aaudio_stream_state_t   mState = AAUDIO_STREAM_STATE_UNINITIALIZED;



    bool isDisconnected_l() const REQUIRES(mLock) {

        return mDisconnected;

    }

    void setDisconnected_l(bool flag) REQUIRES(mLock) {

        mDisconnected = flag;

    }



    pid_t                   mRegisteredClientThread = ILLEGAL_THREAD_ID;



    std::mutex              mUpMessageQueueLock;
@@ -322,6 +329,8 @@ private: 
    // for example a full message queue. Note that this atomic is unrelated to mCloseNeeded.

    std::atomic<bool>       mSuspended{false};



    bool                    mDisconnected GUARDED_BY(mLock) {false};



protected:

    // Locking order is important.

    // Acquire mLock before acquiring AAudioServiceEndpoint::mLockStreams