summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Duong <joshuaduong@google.com>2020-02-24 10:03:54 -0800
committerJosh Gao <jmgao@google.com>2020-02-24 17:58:34 -0800
commite36a53e3076d38674fc4ddb200c19f1c5de6bcdd (patch)
tree7488f85e6a76e3072d8decd685689580b42356a7
parent3467ef46d436985408c7b126a0e746cd5bb8b2be (diff)
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)
-rw-r--r--adb/client/transport_mdns.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/client/transport_mdns.cpp b/adb/client/transport_mdns.cpp
index ff1f7b4c6..22b9b1808 100644
--- a/adb/client/transport_mdns.cpp
+++ b/adb/client/transport_mdns.cpp
@@ -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,