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

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

Merge changes I89779ab3,I63ec0e57 am: 6c8e3812 am: f39786af am: 6140d46d 

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

Change-Id: If96621b20c0847afd6f52f10c80f1592012b2e73
parents 2768a7b6 6140d46d

libs/binder/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ cc_library { 
    ],

    tidy_checks_as_errors: [

        "*",

        "-google-runtime-int",

    ],

}

libs/binder/Debug.cpp

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ void printHexData(int32_t indent, const void *buf, size_t length, 
    }



    for (offset = 0; ; offset += bytesPerLine, pos += bytesPerLine) {

        long remain = length;

        size_t remain = length;



        char* c = buffer;

        if (!oneLine && !cStyle) {

libs/binder/IPCThreadState.cpp

+9 −9
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static const void* printBinderTransactionData(TextOutput& out, const void* data) 
        out << "target.ptr=" << btd->target.ptr;

    }

    out << " (cookie " << btd->cookie << ")" << endl

        << "code=" << TypeCode(btd->code) << ", flags=" << (void*)(long)btd->flags << endl

        << "code=" << TypeCode(btd->code) << ", flags=" << (void*)(uint64_t)btd->flags << endl

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

        << " bytes)" << endl

        << "offsets=" << btd->data.ptr.offsets << " (" << (void*)btd->offsets_size
@@ -150,7 +150,7 @@ static const void* printReturnCommand(TextOutput& out, const void* _cmd) 
    uint32_t code = (uint32_t)*cmd++;

    size_t cmdIndex = code & 0xff;

    if (code == BR_ERROR) {

        out << "BR_ERROR: " << (void*)(long)(*cmd++) << endl;

        out << "BR_ERROR: " << (void*)(uint64_t)(*cmd++) << endl;

        return cmd;

    } else if (cmdIndex >= N) {

        out << "Unknown reply: " << code << endl;
@@ -177,21 +177,21 @@ static const void* printReturnCommand(TextOutput& out, const void* _cmd) 
        case BR_DECREFS: {

            const int32_t b = *cmd++;

            const int32_t c = *cmd++;

            out << ": target=" << (void*)(long)b << " (cookie " << (void*)(long)c << ")";

            out << ": target=" << (void*)(uint64_t)b << " (cookie " << (void*)(uint64_t)c << ")";

        } break;



        case BR_ATTEMPT_ACQUIRE: {

            const int32_t p = *cmd++;

            const int32_t b = *cmd++;

            const int32_t c = *cmd++;

            out << ": target=" << (void*)(long)b << " (cookie " << (void*)(long)c

            out << ": target=" << (void*)(uint64_t)b << " (cookie " << (void*)(uint64_t)c

                << "), pri=" << p;

        } break;



        case BR_DEAD_BINDER:

        case BR_CLEAR_DEATH_NOTIFICATION_DONE: {

            const int32_t c = *cmd++;

            out << ": death cookie " << (void*)(long)c;

            out << ": death cookie " << (void*)(uint64_t)c;

        } break;



        default:
@@ -232,7 +232,7 @@ static const void* printCommand(TextOutput& out, const void* _cmd) 


        case BC_FREE_BUFFER: {

            const int32_t buf = *cmd++;

            out << ": buffer=" << (void*)(long)buf;

            out << ": buffer=" << (void*)(uint64_t)buf;

        } break;



        case BC_INCREFS:
@@ -247,7 +247,7 @@ static const void* printCommand(TextOutput& out, const void* _cmd) 
        case BC_ACQUIRE_DONE: {

            const int32_t b = *cmd++;

            const int32_t c = *cmd++;

            out << ": target=" << (void*)(long)b << " (cookie " << (void*)(long)c << ")";

            out << ": target=" << (void*)(uint64_t)b << " (cookie " << (void*)(uint64_t)c << ")";

        } break;



        case BC_ATTEMPT_ACQUIRE: {
@@ -260,12 +260,12 @@ static const void* printCommand(TextOutput& out, const void* _cmd) 
        case BC_CLEAR_DEATH_NOTIFICATION: {

            const int32_t h = *cmd++;

            const int32_t c = *cmd++;

            out << ": handle=" << h << " (death cookie " << (void*)(long)c << ")";

            out << ": handle=" << h << " (death cookie " << (void*)(uint64_t)c << ")";

        } break;



        case BC_DEAD_BINDER_DONE: {

            const int32_t c = *cmd++;

            out << ": death cookie " << (void*)(long)c;

            out << ": death cookie " << (void*)(uint64_t)c;

        } break;



        default:

libs/binder/IServiceManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ sp<IBinder> ServiceManagerShim::getService(const String16& name) const 


    const bool isVendorService =

        strcmp(ProcessState::self()->getDriverName().c_str(), "/dev/vndbinder") == 0;

    const long timeout = 5000;

    constexpr int64_t timeout = 5000;

    int64_t startTime = uptimeMillis();

    // Vendor code can't access system properties

    if (!gSystemBootCompleted && !isVendorService) {
@@ -234,7 +234,7 @@ sp<IBinder> ServiceManagerShim::getService(const String16& name) const 
#endif

    }

    // retry interval in millisecond; note that vendor services stay at 100ms

    const long sleepTime = gSystemBootCompleted ? 1000 : 100;

    const useconds_t sleepTime = gSystemBootCompleted ? 1000 : 100;



    ALOGI("Waiting for service '%s' on '%s'...", String8(name).string(),

          ProcessState::self()->getDriverName().c_str());

libs/binder/include/binder/Parcel.h

+2 −0
Original line number Diff line number Diff line
@@ -33,8 +33,10 @@ 
#include <binder/Parcelable.h>



#ifdef BINDER_IPC_32BIT

//NOLINTNEXTLINE(google-runtime-int) b/173188702

typedef unsigned int binder_size_t;

#else

//NOLINTNEXTLINE(google-runtime-int) b/173188702

typedef unsigned long long binder_size_t;

#endif