commit 5faaaf34b8c04600d94bc66b5fc08185e380ae3d
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 13 02:51:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 13 02:51:22 2021 +0000
tree 275844ca02b652f857586f2ecd68dce491ab2545
parent 014a4507cfb46e35ae34b9cd537c6a6e6df84f4b
parent 14b37aed777a7652ff7a1079da16e73e167f0587

Merge "libbinder_ndk: dump class ptrs in assoc. failure" am: 8395fee29d am: b6e937d1cd am: 14b37aed77

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

Change-Id: I7d605a027ab015729e11e6aaba096b945e9830e9

libs/binder/ndk/ibinder.cpp

diff --git a/libs/binder/ndk/ibinder.cpp b/libs/binder/ndk/ibinder.cpp
index 785e032..717beec 100644
--- a/libs/binder/ndk/ibinder.cpp
+++ b/libs/binder/ndk/ibinder.cpp
@@ -82,8 +82,8 @@
         const String16& currentDescriptor = mClazz->getInterfaceDescriptor();
         if (newDescriptor == currentDescriptor) {
             LOG(ERROR) << __func__ << ": Class descriptors '" << currentDescriptor
-                       << "' match during associateClass, but they are different class objects. "
-                          "Class descriptor collision?";
+                       << "' match during associateClass, but they are different class objects ("
+                       << clazz << " vs " << mClazz << "). Class descriptor collision?";
         } else {
             LOG(ERROR) << __func__
                        << ": Class cannot be associated on object which already has a class. "