am 0c0cfd5c: Merge change I96cd6f5b into eclair

Merge commit '0c0cfd5ce4a26187fb910ba701d0021989103a25' into eclair-plus-aosp

* commit '0c0cfd5ce4a26187fb910ba701d0021989103a25':
  Make the socket test accept ::1 as a valid result for

1 files changed, 8 insertions, 1 deletions

diff --git a/libcore/luni/src/test/java/tests/api/java/net/SocketTest.java b/libcore/luni/src/test/java/tests/api/java/net/SocketTest.java
index 3d6fbeb00..7cc31a0f4 100644
--- a/libcore/luni/src/test/java/tests/api/java/net/SocketTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/net/SocketTest.java
@@ -158,7 +158,14 @@ public class SocketTest extends SocketTestCase {
         Socket socket = null;
         try {
             socket = new Socket(InetAddress.getByName(null), sport);
-            assertEquals(InetAddress.getByName("127.0.0.1"), socket.getLocalAddress());
+            InetAddress address = socket.getLocalAddress();
+            if (Boolean.getBoolean("java.net.preferIPv6Addresses")) {
+                assertTrue(
+                    address.equals(InetAddress.getByName("::1")) ||
+                    address.equals(InetAddress.getByName("0:0:0:0:0:0:0:1")));
+            } else {
+                assertEquals(address, InetAddress.getByName("127.0.0.1"));
+            }
         } finally {
             try {
                 socket.close();