diff options
| author | Neil Fuller <nfuller@google.com> | 2015-06-02 16:15:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-06-02 16:15:28 +0000 |
| commit | b96afd7caf4486aa3306b62c08f43a660b5bf8f8 (patch) | |
| tree | aa097699e1abec81c8d5aa627a18796bed98cb46 | |
| parent | 3ad9b58657e3abff45108d89406e2180adf2d77a (diff) | |
| parent | 27ef0eb26e179b7750b9cb72018da9fab3a0bbb0 (diff) | |
| download | libcore-b96afd7caf4486aa3306b62c08f43a660b5bf8f8.zip libcore-b96afd7caf4486aa3306b62c08f43a660b5bf8f8.tar.gz libcore-b96afd7caf4486aa3306b62c08f43a660b5bf8f8.tar.bz2 | |
Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipop-cts-dev
automerge: 27ef0eb
* commit '27ef0eb26e179b7750b9cb72018da9fab3a0bbb0':
Fix for MulticastSocketTest for non-multicast interfaces
| -rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java index d531301..828dc99 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java @@ -706,7 +706,7 @@ public class MulticastSocketTest extends junit.framework.TestCase { Enumeration theInterfaces = NetworkInterface.getNetworkInterfaces(); while (theInterfaces.hasMoreElements()) { NetworkInterface thisInterface = (NetworkInterface) theInterfaces.nextElement(); - if (thisInterface.getInetAddresses().hasMoreElements() && thisInterface.isUp()) { + if (willWorkForMulticast(thisInterface)) { if ((!(thisInterface.getInetAddresses().nextElement()).isLoopbackAddress())) { MulticastSocket receivingSocket = createReceivingSocket(0); InetSocketAddress groupAddress = |