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

Commit 9e8b6427 authored by Steven Moreland's avatar Steven Moreland
Browse files

libbinder:interruptableRecv>interruptableReadFully 

Rename, as suggested by elsk@, since that's what this function does.

Bug: N/A
Test: N/A
Change-Id: Ic52adef004e985df2fd16ee30224ab2f179352ee
parent dfe3be98

libs/binder/RpcServer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ void RpcServer::establishConnection(sp<RpcServer>&& server, base::unique_fd clie 
    LOG_ALWAYS_FATAL_IF(server->mShutdownTrigger == nullptr);



    int32_t id;

    bool idValid = server->mShutdownTrigger->interruptableRecv(clientFd.get(), &id, sizeof(id));

    bool idValid =

            server->mShutdownTrigger->interruptableReadFully(clientFd.get(), &id, sizeof(id));

    if (!idValid) {

        ALOGE("Failed to read ID for client connecting to RPC server.");

    }

libs/binder/RpcSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ bool RpcSession::FdTrigger::triggerablePollRead(base::borrowed_fd fd) { 
    }

}



bool RpcSession::FdTrigger::interruptableRecv(base::borrowed_fd fd, void* data, size_t size) {

bool RpcSession::FdTrigger::interruptableReadFully(base::borrowed_fd fd, void* data, size_t size) {

    uint8_t* buffer = reinterpret_cast<uint8_t*>(data);

    uint8_t* end = buffer + size;

libs/binder/include/binder/RpcSession.h

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ private: 
         *   true - read succeeded at 'size'

         *   false - interrupted (failure or trigger)

         */

        bool interruptableRecv(base::borrowed_fd fd, void* data, size_t size);

        bool interruptableReadFully(base::borrowed_fd fd, void* data, size_t size);



    private:

        base::unique_fd mWrite;