commit 8c04cd041dfc96ef4af662d50aad63d998314d27
author Robert Greenwalt <rgreenwalt@google.com> Mon May 06 11:12:02 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 06 11:12:02 2013 -0700
tree 66fa45180a9383f85a87dac3d8e31126aadad187
parent 664f785e2c8697aa31fa69b9a109c09a99a2d50b
parent 341666c40d222145f7dfd44bdbed48590c4dc5da

am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev

* commit '341666c40d222145f7dfd44bdbed48590c4dc5da':
  Fix sync problem in NsdManager

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

diff --git a/core/java/android/net/nsd/NsdManager.java b/core/java/android/net/nsd/NsdManager.java
index 08ba728..9c3e405 100644
--- a/core/java/android/net/nsd/NsdManager.java
+++ b/core/java/android/net/nsd/NsdManager.java
@@ -306,10 +306,9 @@
             switch (message.what) {
                 case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED:
                     mAsyncChannel.sendMessage(AsyncChannel.CMD_CHANNEL_FULL_CONNECTION);
-                    mConnected.countDown();
                     break;
                 case AsyncChannel.CMD_CHANNEL_FULLY_CONNECTED:
-                    // Ignore
+                    mConnected.countDown();
                     break;
                 case AsyncChannel.CMD_CHANNEL_DISCONNECTED:
                     Log.e(TAG, "Channel lost");