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

Commit d36af3bf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix return types of sendMessageOnSocket/receiveMessageFromSocket" am:... 

Merge "Fix return types of sendMessageOnSocket/receiveMessageFromSocket" am: b1815e3c am: e7854e1f am: 4b39a60c

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



Change-Id: Ifdeb31e31f6ffd7d78638738d18e86f0917d02db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents afc9086a 4b39a60c

libs/binder/OS.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ std::unique_ptr<RpcTransportCtxFactory> makeDefaultRpcTransportCtxFactory() { 
    return RpcTransportCtxFactoryRaw::make();

    return RpcTransportCtxFactoryRaw::make();

}

}





int sendMessageOnSocket(

ssize_t sendMessageOnSocket(

        const RpcTransportFd& socket, iovec* iovs, int niovs,

        const RpcTransportFd& socket, iovec* iovs, int niovs,

        const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) {

        const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) {

    if (ancillaryFds != nullptr && !ancillaryFds->empty()) {

    if (ancillaryFds != nullptr && !ancillaryFds->empty()) {
@@ -112,7 +112,7 @@ int sendMessageOnSocket( 
    return TEMP_FAILURE_RETRY(sendmsg(socket.fd.get(), &msg, MSG_NOSIGNAL));

    return TEMP_FAILURE_RETRY(sendmsg(socket.fd.get(), &msg, MSG_NOSIGNAL));

}

}





int receiveMessageFromSocket(

ssize_t receiveMessageFromSocket(

        const RpcTransportFd& socket, iovec* iovs, int niovs,

        const RpcTransportFd& socket, iovec* iovs, int niovs,

        std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) {

        std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) {

    if (ancillaryFds != nullptr) {

    if (ancillaryFds != nullptr) {

libs/binder/OS.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -33,11 +33,11 @@ status_t dupFileDescriptor(int oldFd, int* newFd); 




std::unique_ptr<RpcTransportCtxFactory> makeDefaultRpcTransportCtxFactory();

std::unique_ptr<RpcTransportCtxFactory> makeDefaultRpcTransportCtxFactory();





int sendMessageOnSocket(

ssize_t sendMessageOnSocket(

        const RpcTransportFd& socket, iovec* iovs, int niovs,

        const RpcTransportFd& socket, iovec* iovs, int niovs,

        const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds);

        const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds);





int receiveMessageFromSocket(

ssize_t receiveMessageFromSocket(

        const RpcTransportFd& socket, iovec* iovs, int niovs,

        const RpcTransportFd& socket, iovec* iovs, int niovs,

        std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds);

        std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds);

libs/binder/RpcTransportRaw.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,8 @@ public: 
            override {

            override {

        bool sentFds = false;

        bool sentFds = false;

        auto send = [&](iovec* iovs, int niovs) -> ssize_t {

        auto send = [&](iovec* iovs, int niovs) -> ssize_t {

            int ret = sendMessageOnSocket(mSocket, iovs, niovs, sentFds ? nullptr : ancillaryFds);

            ssize_t ret =

                    sendMessageOnSocket(mSocket, iovs, niovs, sentFds ? nullptr : ancillaryFds);

            sentFds |= ret > 0;

            sentFds |= ret > 0;

            return ret;

            return ret;

        };

        };

libs/binder/trusty/OS.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -59,14 +59,14 @@ std::unique_ptr<RpcTransportCtxFactory> makeDefaultRpcTransportCtxFactory() { 
    return RpcTransportCtxFactoryTipcTrusty::make();

    return RpcTransportCtxFactoryTipcTrusty::make();

}

}





int sendMessageOnSocket(

ssize_t sendMessageOnSocket(

        const RpcTransportFd& /* socket */, iovec* /* iovs */, int /* niovs */,

        const RpcTransportFd& /* socket */, iovec* /* iovs */, int /* niovs */,

        const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* /* ancillaryFds */) {

        const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* /* ancillaryFds */) {

    errno = ENOTSUP;

    errno = ENOTSUP;

    return -1;

    return -1;

}

}





int receiveMessageFromSocket(

ssize_t receiveMessageFromSocket(

        const RpcTransportFd& /* socket */, iovec* /* iovs */, int /* niovs */,

        const RpcTransportFd& /* socket */, iovec* /* iovs */, int /* niovs */,

        std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* /* ancillaryFds */) {

        std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* /* ancillaryFds */) {

    errno = ENOTSUP;

    errno = ENOTSUP;