commit 7aa7bb4dfb01e3d32ad040eff8b35245a8bf2292
author Robert Greenwalt <rgreenwalt@google.com> Thu May 02 15:45:32 2013 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Thu May 02 15:45:32 2013 -0700
tree c29ef2bb630b994c73f40f5229a14a3c61a70ffd
parent 54824c9538cc44a7357cf3f093093e20d455e990

Fix sync problem in NsdManager

The NsdManager init was thinking it was done before the AsyncChannel
was fully setup and if the setup were slow and the app fast, the app
could make calls to the NsdManager that it wasn't ready for.

bug:8545006
Change-Id: I2cb2a7c0a1c7f3d2b81ac0f66d37346e6d2d720d

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");