Merge "libbinder: avoid re-registering callback"

        return false;

    }

    if (!reRegister) {

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

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

            return false;

        }

    if (!reRegister) {

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

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

    }