commit 71ae66d6877a01d4808bd16ede1442c991579635
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 27 00:27:18 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 27 00:27:18 2021 +0000
tree d2fa4b0c503a0ccd4e2af98f83c527780839a1f3
parent d492e04bff450c4e3c15673e901d7eb7a8d6ea3a
parent fe79a6a8b2d67a6f43fa77ed6f6e40caf0818b6f

Merge "[Bugfix] Fix compling error when enable LOG_REFS in Parcel.cpp" am: 35e7d618aa am: fe79a6a8b2

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

Change-Id: I638276ffefa84e75e6b714aa20c4fd67988d3442

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index e623874..99b6be8 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -104,7 +104,7 @@
     switch (obj.hdr.type) {
         case BINDER_TYPE_BINDER:
             if (obj.binder) {
-                LOG_REFS("Parcel %p acquiring reference on local %p", who, obj.cookie);
+                LOG_REFS("Parcel %p acquiring reference on local %llu", who, obj.cookie);
                 reinterpret_cast<IBinder*>(obj.cookie)->incStrong(who);
             }
             return;
@@ -137,7 +137,7 @@
     switch (obj.hdr.type) {
         case BINDER_TYPE_BINDER:
             if (obj.binder) {
-                LOG_REFS("Parcel %p releasing reference on local %p", who, obj.cookie);
+                LOG_REFS("Parcel %p releasing reference on local %llu", who, obj.cookie);
                 reinterpret_cast<IBinder*>(obj.cookie)->decStrong(who);
             }
             return;