Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8f60417 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "libbinder_ndk: dump class ptrs in assoc. failure" am: 8395fee2 am: b6e937d1 am: 14b37aed am: 5faaaf34 am: cf3e560d

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

Change-Id: I3d00d0344539de8caa3636ea3ed052e056cbe50e
parents eed5b459 cf3e560d

libs/binder/ndk/ibinder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ std::optional<bool> AIBinder::associateClassInternal(const AIBinder_Class* clazz 
        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. "