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

Commit 229098ef authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: fix hanging wait in RpcSession" am: 28a7564a am: d88278d2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2133631



Change-Id: I2d4f31fc204de44a82a936f4633058eddf66a314
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85c224c2 d88278d2

libs/binder/RpcSession.cpp

+11 −10
Original line number Diff line number Diff line
@@ -699,10 +699,7 @@ status_t RpcSession::addOutgoingConnection(std::unique_ptr<RpcTransport> rpcTran 
                mRpcBinderState->sendConnectionInit(connection, sp<RpcSession>::fromExisting(this));

    }



    {

        std::lock_guard<std::mutex> _l(mMutex);

        connection->exclusiveTid = std::nullopt;

    }

    clearConnectionTid(connection);



    return status;

}
@@ -773,6 +770,15 @@ bool RpcSession::removeIncomingConnection(const sp<RpcConnection>& connection) { 
    return false;

}



void RpcSession::clearConnectionTid(const sp<RpcConnection>& connection) {

    std::unique_lock<std::mutex> _l(mMutex);

    connection->exclusiveTid = std::nullopt;

    if (mConnections.mWaitingThreads > 0) {

        _l.unlock();

        mAvailableConnectionCv.notify_one();

    }

}



std::vector<uint8_t> RpcSession::getCertificate(RpcCertificateFormat format) {

    return mCtx->getCertificate(format);

}
@@ -902,12 +908,7 @@ RpcSession::ExclusiveConnection::~ExclusiveConnection() { 
    // is using this fd, and it retains the right to it. So, we don't give up

    // exclusive ownership, and no thread is freed.

    if (!mReentrant && mConnection != nullptr) {

        std::unique_lock<std::mutex> _l(mSession->mMutex);

        mConnection->exclusiveTid = std::nullopt;

        if (mSession->mConnections.mWaitingThreads > 0) {

            _l.unlock();

            mSession->mAvailableConnectionCv.notify_one();

        }

        mSession->clearConnectionTid(mConnection);

    }

}

libs/binder/include/binder/RpcSession.h

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ private: 
    sp<RpcConnection> assignIncomingConnectionToThisThread(

            std::unique_ptr<RpcTransport> rpcTransport);

    [[nodiscard]] bool removeIncomingConnection(const sp<RpcConnection>& connection);

    void clearConnectionTid(const sp<RpcConnection>& connection);



    [[nodiscard]] status_t initShutdownTrigger();