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

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

Merge "libbinder: statusToString for status_t errors" into main am: 8a482fd1 

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



Change-Id: Ifb5162d5be10c86217e256a7daa54325dc1c6b4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36ba9681 8a482fd1

libs/binder/IMemory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -330,8 +330,8 @@ void BpMemoryHeap::assertReallyMapped() const 
        if (err != NO_ERROR || // failed transaction

                size != size64 || offset != offset64) { // ILP32 size check

            ALOGE("binder=%p transaction failed fd=%d, size=%zu, err=%d (%s)",

                    IInterface::asBinder(this).get(),

                    parcel_fd, size, err, strerror(-err));

                  IInterface::asBinder(this).get(), parcel_fd, size, err,

                  statusToString(err).c_str());

            return;

        }

libs/binder/Parcel.cpp

+2 −1
Original line number Diff line number Diff line
@@ -668,7 +668,8 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 
                // FD was unowned in the source parcel.

                int newFd = -1;

                if (status_t status = binder::os::dupFileDescriptor(oldFd, &newFd); status != OK) {

                    ALOGW("Failed to duplicate file descriptor %d: %s", oldFd, strerror(-status));

                    ALOGW("Failed to duplicate file descriptor %d: %s", oldFd,

                          statusToString(status).c_str());

                }

                rpcFields->mFds->emplace_back(unique_fd(newFd));

                // Fixup the index in the data.

libs/binder/RpcServer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ void RpcServer::establishConnection( 


                auto status = binder::os::getRandomBytes(sessionId.data(), sessionId.size());

                if (status != OK) {

                    ALOGE("Failed to read random session ID: %s", strerror(-status));

                    ALOGE("Failed to read random session ID: %s", statusToString(status).c_str());

                    return;

                }

            } while (server->mSessions.end() != server->mSessions.find(sessionId));

libs/binder/RpcSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ status_t RpcSession::setupUnixDomainSocketBootstrapClient(unique_fd bootstrapFd) 
        status_t status = mBootstrapTransport->interruptableWriteFully(mShutdownTrigger.get(), &iov,

                                                                       1, std::nullopt, &fds);

        if (status != OK) {

            ALOGE("Failed to send fd over bootstrap transport: %s", strerror(-status));

            ALOGE("Failed to send fd over bootstrap transport: %s", statusToString(status).c_str());

            return status;

        }