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

Commit 490494ea authored by Alice Ryhl's avatar Alice Ryhl Committed by Automerger Merge Worker
Browse files

Merge "binder: fix debug printing in IPCThreadState" am: 7f623a39 

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



Change-Id: I1b710acea8c204fedb064395b94c56390ffd0249
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ac001eb 7f623a39

libs/binder/IPCThreadState.cpp

+19 −5
Original line number Diff line number Diff line
@@ -132,12 +132,21 @@ static const void* printBinderTransactionData(std::ostream& out, const void* dat 
    } else {

        out << "\ttarget.ptr=" << btd->target.ptr;

    }

    out << "\t (cookie " << btd->cookie << ")"

        << "\n"

    out << "\t (cookie " << btd->cookie << ")\n"

        << "\tcode=" << TypeCode(btd->code) << ", flags=" << (void*)(uint64_t)btd->flags << "\n"

        << "\tdata=" << btd->data.ptr.buffer << " (" << (void*)btd->data_size << " bytes)"

        << "\n"

        << "\toffsets=" << btd->data.ptr.offsets << " (" << (void*)btd->offsets_size << " bytes)";

        << "\tdata=" << btd->data.ptr.buffer << " (" << (void*)btd->data_size << " bytes)\n"

        << "\toffsets=" << btd->data.ptr.offsets << " (" << (void*)btd->offsets_size << " bytes)\n";

    return btd + 1;

}



static const void* printBinderTransactionDataSecCtx(std::ostream& out, const void* data) {

    const binder_transaction_data_secctx* btd = (const binder_transaction_data_secctx*)data;



    printBinderTransactionData(out, &btd->transaction_data);



    char* secctx = (char*)btd->secctx;

    out << "\tsecctx=" << secctx << "\n";



    return btd+1;

}
@@ -156,6 +165,11 @@ static const void* printReturnCommand(std::ostream& out, const void* _cmd) { 
    out << "\t" << kReturnStrings[cmdIndex];



    switch (code) {

        case BR_TRANSACTION_SEC_CTX: {

            out << ": ";

            cmd = (const int32_t*)printBinderTransactionDataSecCtx(out, cmd);

        } break;



        case BR_TRANSACTION:

        case BR_REPLY: {

            out << ": ";