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

Commit 75fda6fd authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder_ndk: dead binder when associating dead binder" am: b46521f5... 

Merge "libbinder_ndk: dead binder when associating dead binder" am: b46521f5 am: 54fffc5b am: d15e50b3 am: ce2ff0a9 am: f00d2348

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

Change-Id: I70c7ec92eeb668b6f1a1aa49644e4eff0181f8e6
parents c945c8cb f00d2348

libs/binder/ndk/ibinder.cpp

+8 −2
Original line number Diff line number Diff line
@@ -99,8 +99,14 @@ bool AIBinder::associateClass(const AIBinder_Class* clazz) { 


    String8 descriptor(getBinder()->getInterfaceDescriptor());

    if (descriptor != newDescriptor) {

        if (getBinder()->isBinderAlive()) {

            LOG(ERROR) << __func__ << ": Expecting binder to have class '" << newDescriptor.c_str()

                       << "' but descriptor is actually '" << descriptor.c_str() << "'.";

        } else {

            // b/155793159

            LOG(ERROR) << __func__ << ": Cannot associate class '" << newDescriptor.c_str()

                       << "' to dead binder.";

        }

        return false;

    }