Properly remove adb DNS services.
Bug: b/150136878
Bug: b/111434128
Bug: http://b/150032044
Test: make
Change-Id: Ibfb92a7c197a25fd1913107d277fbc5f78108c05
Merged-In: Ibfb92a7c197a25fd1913107d277fbc5f78108c05
(cherry picked from commit 79a452a923057a8f8fb6fa4bf9075e71c7a737e4)
diff --git a/adb/client/transport_mdns.cpp b/adb/client/transport_mdns.cpp
index ff1f7b4..22b9b18 100644
--- a/adb/client/transport_mdns.cpp
+++ b/adb/client/transport_mdns.cpp
@@ -409,9 +409,9 @@
}
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,