diff options
| author | 2020-11-17 00:26:58 +0000 | |
|---|---|---|
| committer | 2020-11-17 00:26:58 +0000 | |
| commit | 6140d46d41f549ceff103e42270d0ada57705117 (patch) | |
| tree | 2c7d3f0e08ca375c12e90ee5a89d8d4e8442c566 /libs/binder/IPCThreadState.cpp | |
| parent | 2cc6ed18f8817d725913aa5443850c63ee660918 (diff) | |
| parent | f39786af24d1680592ef60b542025b4b68ebe053 (diff) | |
Merge changes I89779ab3,I63ec0e57 am: 6c8e3812b9 am: f39786af24
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1498600
Change-Id: Ia53c6167a3f04f1b6057a6e913585cfa93eee5d0
Diffstat (limited to 'libs/binder/IPCThreadState.cpp')
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index c5835c614a..d4c7acfdfd 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -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: |