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

Commit d20ed1df authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "init: Skip interface duplicates if service is an override" am: 8c7cbf01 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2009975

Change-Id: I3c32b073ce86e4f98593a7e27181fd9df83009c5
parents 9d098cad 8c7cbf01

init/service_parser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ Result<void> ServiceParser::ParseInterface(std::vector<std::string>&& args) { 
    const std::string fullname = interface_name + "/" + instance_name;



    for (const auto& svc : *service_list_) {

        if (svc->interfaces().count(fullname) > 0) {

        if (svc->interfaces().count(fullname) > 0 && !service_->is_override()) {

            return Error() << "Interface '" << fullname << "' redefined in " << service_->name()

                           << " but is already defined by " << svc->name();

        }