Merge "Network Service Discovery test: properly release resources" am: c9d24d203d am: e7849f69a3 am: f467db29f9

am: e91afaefd6

Change-Id: Icd9033ce7e32d5bddc9d0eba38b3b381fe424004

tests/net/java/com/android/server/NsdServiceTest.java

@@ -95,6 +95,9 @@ public class NsdServiceTest {
         client2.disconnect();
 
         verify(mDaemon, timeout(mTimeoutMs).times(1)).stop();
+
+        client1.disconnect();
+        client2.disconnect();
     }
 
     @Test
@@ -131,6 +134,8 @@ public class NsdServiceTest {
 
         // checks that request are cleaned
         verifyDaemonCommands("stop-register 2", "stop-discover 3", "stop-resolve 4");
+
+        client.disconnect();
     }
 
     NsdService makeService() {