commit b46679f8f771706b0cc5f39f9f876d528064faaf
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 24 23:37:16 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 24 23:37:16 2020 +0000
tree adb0f541bfacc5f42ee57863663ffc9858a3e30a
parent 52a47196168dad427d2eff72a66db8bcc1133707
parent 75d3bc9875a8b34f09d642db1b55e232c4ba4d67

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

Change-Id: Ide4cfba8cb654d664a6c8dcf73bb145c2b0b4791

adb/client/transport_mdns.cpp

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,