summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <rgreenwalt@google.com> 2013-05-02 15:45:32 -0700
committer Robert Greenwalt <rgreenwalt@google.com> 2013-05-02 15:45:32 -0700
commitaf2eefb70146a94dc4ae1d85ffe2b0e5e8f35a69 (patch)
tree5480d266c5da4f1b1816192b937742b0bb823e9f
parent7521541c2a26d29c28c6b1bd60fc4550e5eb5c49 (diff)
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
-rw-r--r--core/java/android/net/nsd/NsdManager.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/net/nsd/NsdManager.java b/core/java/android/net/nsd/NsdManager.java
index 08ba728f65a4..9c3e405f44b7 100644
--- a/core/java/android/net/nsd/NsdManager.java
+++ b/core/java/android/net/nsd/NsdManager.java
@@ -306,10 +306,9 @@ public final class NsdManager {
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");