ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: I3c32b073ce86e4f98593a7e27181fd9df83009c5
This commit is contained in:
David Anderson 2022-03-08 03:01:29 +00:00 • committed by Automerger Merge Worker
commit d20ed1dfc8
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/service_parser.cpp
View file

@ -202,7 +202,7 @@ Result<void> ServiceParser::ParseInterface(std::vector<std::string>&& args) {
const std::string fullname = interface_name + "/" + instance_name; const std::string fullname = interface_name + "/" + instance_name;
for (const auto& svc : *service_list_) { 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() return Error() << "Interface '" << fullname << "' redefined in " << service_->name()
<< " but is already defined by " << svc->name(); << " but is already defined by " << svc->name();
} }