commit b6e937d1cdff640a4e941dc5371a11cffc3ad6e5
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 13 02:21:33 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 13 02:21:33 2021 +0000
tree 68606fe91be5fd9b6a1319f1e9f8da79075bb21b
parent d6a6e178c55f2dbd37275b30b15e4e4817223526
parent 8395fee29d9e64b78bd7e64531ccdcff50ddcabb

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

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

Change-Id: Idc266c2789637d288965b270f1d41fd40f3bf754

libs/binder/ndk/ibinder.cpp

diff --git a/libs/binder/ndk/ibinder.cpp b/libs/binder/ndk/ibinder.cpp
index 2abb6f7..11e9fc5 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. "