diff options
| author | Neil Fuller <nfuller@google.com> | 2015-09-01 09:14:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 09:14:46 +0000 |
| commit | 381d70a8dca1e1ba3ea1422e1759da148913c8d0 (patch) | |
| tree | dca7303d54b9b04d92219fb3012f0399953456c8 | |
| parent | e643681966cc64a0329848daf164b15ad2dd0f44 (diff) | |
| parent | 27ef0eb26e179b7750b9cb72018da9fab3a0bbb0 (diff) | |
| download | libcore-381d70a8dca1e1ba3ea1422e1759da148913c8d0.zip libcore-381d70a8dca1e1ba3ea1422e1759da148913c8d0.tar.gz libcore-381d70a8dca1e1ba3ea1422e1759da148913c8d0.tar.bz2 | |
am 27ef0eb2: Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipop-cts-dev
* 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 = |