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

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

Merge "RecordedTransaction use Parcel::dataBufferSize" am: 305ab711 am:... 

Merge "RecordedTransaction use Parcel::dataBufferSize" am: 305ab711 am: d8096153 am: 0caf2f69 am: f5dadfad

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



Change-Id: Ic0348d04338e1a39d9658548d963e7b3c3eba82d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2aa3aa7 f5dadfad

libs/binder/RecordedTransaction.cpp

+4 −4
Original line number Diff line number Diff line
@@ -131,12 +131,12 @@ std::optional<RecordedTransaction> RecordedTransaction::fromDetails( 
        return std::nullopt;

    }



    if (t.mSent.setData(dataParcel.data(), dataParcel.dataSize()) != android::NO_ERROR) {

    if (t.mSent.setData(dataParcel.data(), dataParcel.dataBufferSize()) != android::NO_ERROR) {

        LOG(ERROR) << "Failed to set sent parcel data.";

        return std::nullopt;

    }



    if (t.mReply.setData(replyParcel.data(), replyParcel.dataSize()) != android::NO_ERROR) {

    if (t.mReply.setData(replyParcel.data(), replyParcel.dataBufferSize()) != android::NO_ERROR) {

        LOG(ERROR) << "Failed to set reply parcel data.";

        return std::nullopt;

    }
@@ -349,11 +349,11 @@ android::status_t RecordedTransaction::dumpToFile(const unique_fd& fd) const { 
        return UNKNOWN_ERROR;

    }



    if (NO_ERROR != writeChunk(fd, DATA_PARCEL_CHUNK, mSent.dataSize(), mSent.data())) {

    if (NO_ERROR != writeChunk(fd, DATA_PARCEL_CHUNK, mSent.dataBufferSize(), mSent.data())) {

        LOG(ERROR) << "Failed to write sent Parcel to fd " << fd.get();

        return UNKNOWN_ERROR;

    }

    if (NO_ERROR != writeChunk(fd, REPLY_PARCEL_CHUNK, mReply.dataSize(), mReply.data())) {

    if (NO_ERROR != writeChunk(fd, REPLY_PARCEL_CHUNK, mReply.dataBufferSize(), mReply.data())) {

        LOG(ERROR) << "Failed to write reply Parcel to fd " << fd.get();

        return UNKNOWN_ERROR;

    }