diff options
| author | 2022-09-30 01:02:34 +0000 | |
|---|---|---|
| committer | 2022-09-30 01:02:34 +0000 | |
| commit | e8dba84365e5328a7ae6f41605e26d18fa28c24c (patch) | |
| tree | 83301a94d18b76865a15926ff1a9d1cf5acf26d6 /libs/binder/Parcel.cpp | |
| parent | 0fda0b412a34cc7c82593a2fb90feac10b1b03ea (diff) | |
| parent | 250b142b9138c4e011e5faee337f4882cd6885f1 (diff) | |
Merge "libbinder : Use logging from liblog" am: 58864fd37f am: 424b87710b am: 57ae1ca8d4 am: 4fc9273332 am: 250b142b91
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2235623
Change-Id: Id7e29a305e1f6dfe7082675ccf3338a2a42ff181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/binder/Parcel.cpp')
| -rw-r--r-- | libs/binder/Parcel.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 888757214d..83332980b2 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -2639,8 +2639,7 @@ status_t Parcel::rpcSetDataReference( return OK; } -void Parcel::print(TextOutput& to, uint32_t /*flags*/) const -{ +void Parcel::print(std::ostream& to, uint32_t /*flags*/) const { to << "Parcel("; if (errorCheck() != NO_ERROR) { @@ -2648,7 +2647,7 @@ void Parcel::print(TextOutput& to, uint32_t /*flags*/) const to << "Error: " << (void*)(intptr_t)err << " \"" << strerror(-err) << "\""; } else if (dataSize() > 0) { const uint8_t* DATA = data(); - to << indent << HexDump(DATA, dataSize()) << dedent; + to << "\t" << HexDump(DATA, dataSize()); #ifdef BINDER_WITH_KERNEL_IPC if (const auto* kernelFields = maybeKernelFields()) { const binder_size_t* OBJS = kernelFields->mObjects; @@ -2656,8 +2655,7 @@ void Parcel::print(TextOutput& to, uint32_t /*flags*/) const for (size_t i = 0; i < N; i++) { const flat_binder_object* flat = reinterpret_cast<const flat_binder_object*>(DATA + OBJS[i]); - to << endl - << "Object #" << i << " @ " << (void*)OBJS[i] << ": " + to << "Object #" << i << " @ " << (void*)OBJS[i] << ": " << TypeCode(flat->hdr.type & 0x7f7f7f00) << " = " << flat->binder; } } |