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

Commit 7dbc3c92 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge "libbinder_ndk: association: rem heap allocs"

parents 84ea3dee 63872b5c

libs/binder/ndk/ibinder.cpp

+8 −9
Original line number Original line Diff line number Diff line
@@ -74,12 +74,12 @@ AIBinder::AIBinder(const AIBinder_Class* clazz) : mClazz(clazz) {} 
AIBinder::~AIBinder() {}

AIBinder::~AIBinder() {}





std::optional<bool> AIBinder::associateClassInternal(const AIBinder_Class* clazz,

std::optional<bool> AIBinder::associateClassInternal(const AIBinder_Class* clazz,

                                                     const String8& newDescriptor, bool set) {

                                                     const String16& newDescriptor, bool set) {

    std::lock_guard<std::mutex> lock(mClazzMutex);

    std::lock_guard<std::mutex> lock(mClazzMutex);

    if (mClazz == clazz) return true;

    if (mClazz == clazz) return true;





    if (mClazz != nullptr) {

    if (mClazz != nullptr) {

        String8 currentDescriptor(mClazz->getInterfaceDescriptor());

        const String16& currentDescriptor = mClazz->getInterfaceDescriptor();

        if (newDescriptor == currentDescriptor) {

        if (newDescriptor == currentDescriptor) {

            LOG(ERROR) << __func__ << ": Class descriptors '" << currentDescriptor

            LOG(ERROR) << __func__ << ": Class descriptors '" << currentDescriptor

                       << "' match during associateClass, but they are different class objects. "

                       << "' match during associateClass, but they are different class objects. "
@@ -88,8 +88,7 @@ std::optional<bool> AIBinder::associateClassInternal(const AIBinder_Class* clazz 
            LOG(ERROR) << __func__

            LOG(ERROR) << __func__

                       << ": Class cannot be associated on object which already has a class. "

                       << ": Class cannot be associated on object which already has a class. "

                          "Trying to associate to '"

                          "Trying to associate to '"

                       << newDescriptor.c_str() << "' but already set to '"

                       << newDescriptor << "' but already set to '" << currentDescriptor << "'.";

                       << currentDescriptor.c_str() << "'.";

        }

        }





        // always a failure because we know mClazz != clazz

        // always a failure because we know mClazz != clazz
@@ -108,21 +107,21 @@ std::optional<bool> AIBinder::associateClassInternal(const AIBinder_Class* clazz 
bool AIBinder::associateClass(const AIBinder_Class* clazz) {

bool AIBinder::associateClass(const AIBinder_Class* clazz) {

    if (clazz == nullptr) return false;

    if (clazz == nullptr) return false;





    String8 newDescriptor(clazz->getInterfaceDescriptor());

    const String16& newDescriptor = clazz->getInterfaceDescriptor();





    auto result = associateClassInternal(clazz, newDescriptor, false);

    auto result = associateClassInternal(clazz, newDescriptor, false);

    if (result.has_value()) return *result;

    if (result.has_value()) return *result;





    CHECK(asABpBinder() != nullptr);  // ABBinder always has a descriptor

    CHECK(asABpBinder() != nullptr);  // ABBinder always has a descriptor





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

    const String16& descriptor = getBinder()->getInterfaceDescriptor();

    if (descriptor != newDescriptor) {

    if (descriptor != newDescriptor) {

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

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

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

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

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

                       << "' but descriptor is actually '" << descriptor << "'.";

        } else {

        } else {

            // b/155793159

            // b/155793159

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

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

                       << "' to dead binder.";

                       << "' to dead binder.";

        }

        }

        return false;

        return false;

libs/binder/ndk/ibinder_internal.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ struct AIBinder : public virtual ::android::RefBase { 




   private:

   private:

    std::optional<bool> associateClassInternal(const AIBinder_Class* clazz,

    std::optional<bool> associateClassInternal(const AIBinder_Class* clazz,

                                               const ::android::String8& newDescriptor, bool set);

                                               const ::android::String16& newDescriptor, bool set);





    // AIBinder instance is instance of this class for a local object. In order to transact on a

    // AIBinder instance is instance of this class for a local object. In order to transact on a

    // remote object, this also must be set for simplicity (although right now, only the

    // remote object, this also must be set for simplicity (although right now, only the