Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2

am: d2181235b9

Change-Id: I7a5202be0e6a6274f3bd11737f30fee0ef947235

core/java/android/net/nsd/NsdManager.java

@@ -31,6 +31,7 @@ import android.util.SparseArray;
 
 import java.util.concurrent.CountDownLatch;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.AsyncChannel;
 import com.android.internal.util.Protocol;
 
@@ -326,7 +327,8 @@ public final class NsdManager {
         public void onServiceResolved(NsdServiceInfo serviceInfo);
     }
 
-    private class ServiceHandler extends Handler {
+    @VisibleForTesting
+    class ServiceHandler extends Handler {
         ServiceHandler(Looper looper) {
             super(looper);
         }