diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-05-06 16:37:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-06 16:37:44 +0000 |
| commit | 341666c40d222145f7dfd44bdbed48590c4dc5da (patch) | |
| tree | 440ed1a05cf69d10f8fa5db7615f5248237bb310 /core/java | |
| parent | 72f2a7af828056fc426d936c1d40cb6bbdbdf7c7 (diff) | |
| parent | af2eefb70146a94dc4ae1d85ffe2b0e5e8f35a69 (diff) | |
Merge "Fix sync problem in NsdManager" into jb-mr2-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/nsd/NsdManager.java | 3 |
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"); |