commit 85f3da97552d75c35a348500ca5c5dc41663c49e
author The Android Automerger <android-build@google.com> Thu Sep 10 01:03:15 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Sep 10 01:03:15 2015 -0700
tree 03297e72990034032b882569fc20dc5cab96e2e4
parent 84887ac9ddfcd1f52c0421f8f77219e134d4c2b8
parent 4ff6e54fd0637670cf71cc75ec028052dae9581b

merge in mnc-dr-release history after reset to mnc-dr-dev

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java

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 b6a5861..264e004 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
@@ -922,7 +922,10 @@
         return iface.isUp()
                 // Typically loopback interfaces do not support multicast, but we rule them out
                 // explicitly anyway.
-                && !iface.isLoopback() && iface.supportsMulticast()
+                && !iface.isLoopback()
+                // Point-to-point interfaces are known to cause problems. http://b/23279677
+                && !iface.isPointToPoint()
+                && iface.supportsMulticast()
                 && iface.getInetAddresses().hasMoreElements();
     }