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

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

Merge "libbinder: fix type of return value from {send,read}_msg" am:... 

Merge "libbinder: fix type of return value from {send,read}_msg" am: 2a207124 am: dcbef393 am: 2300724f am: adf12622

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



Change-Id: Ia261194ce1764fd988b5b7c8329ec4ec8e2e298b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81ab18f6 adf12622

libs/binder/trusty/RpcTransportTipcTrusty.cpp

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public: 
                .num_handles = 0, // TODO: add ancillaryFds

                .handles = nullptr,

        };

        int rc = send_msg(mSocket.get(), &msg);

        ssize_t rc = send_msg(mSocket.get(), &msg);

        if (rc == ERR_NOT_ENOUGH_BUFFER) {

            // Peer is blocked, wait until it unblocks.

            // TODO: when tipc supports a send-unblocked handler,
@@ -89,7 +89,7 @@ public: 
            return statusFromTrusty(rc);

        }

        LOG_ALWAYS_FATAL_IF(static_cast<size_t>(rc) != size,

                            "Sent the wrong number of bytes %d!=%zu", rc, size);

                            "Sent the wrong number of bytes %zd!=%zu", rc, size);



        return OK;

    }
@@ -129,7 +129,7 @@ public: 
                    .num_handles = 0, // TODO: support ancillaryFds

                    .handles = nullptr,

            };

            int rc = read_msg(mSocket.get(), mMessageInfo.id, mMessageOffset, &msg);

            ssize_t rc = read_msg(mSocket.get(), mMessageInfo.id, mMessageOffset, &msg);

            if (rc < 0) {

                return statusFromTrusty(rc);

            }