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

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

Merge "libbinder: avoid re-registering callback" into rvc-dev am: e515579f 

Change-Id: Ied95127de5451df4c3c7a509fbfc29ab7fb436a3
parents 10157e49 e515579f

libs/binder/LazyServiceRegistrar.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -82,12 +82,12 @@ bool ClientCounterCallback::registerService(const sp<IBinder>& service, const st 
        return false;

        return false;

    }

    }





    if (!reRegister) {

        if (!manager->registerClientCallback(name, service, this).isOk()) {

        if (!manager->registerClientCallback(name, service, this).isOk()) {

            ALOGE("Failed to add client callback for service %s", name.c_str());

            ALOGE("Failed to add client callback for service %s", name.c_str());

            return false;

            return false;

        }

        }





    if (!reRegister) {

        // Only add this when a service is added for the first time, as it is not removed

        // Only add this when a service is added for the first time, as it is not removed

        mRegisteredServices[name] = {service, allowIsolated, dumpFlags};

        mRegisteredServices[name] = {service, allowIsolated, dumpFlags};

    }

    }