Merge "Properly remove adb DNS services." am: 7445a87101 am: 75d3bc9875

Change-Id: Ide4cfba8cb654d664a6c8dcf73bb145c2b0b4791
This commit is contained in:
Automerger Merge Worker 2020-02-24 23:37:16 +00:00
commit b46679f8f7
1 changed files with 3 additions and 3 deletions

View File

@ -409,9 +409,9 @@ static void adb_RemoveDNSService(const char* regType, const char* serviceName) {
}
std::string sName(serviceName);
std::remove_if(services->begin(), services->end(), [&sName](ResolvedService* service) {
return (sName == service->serviceName());
});
services->erase(std::remove_if(
services->begin(), services->end(),
[&sName](ResolvedService* service) { return (sName == service->serviceName()); }));
}
// Returns the version the device wanted to advertise,