commit 8b93ce0f73af7dd41abc1e7ac85cf0dda4eaeeb9
author Daniel Xie <dxie@google.com> Wed Jun 03 22:28:55 2015 -0700
committer Daniel Xie <dxie@google.com> Thu Jun 04 05:30:08 2015 +0000
tree 507a82a8504b029818808a448770b7b3067ab47b
parent 47d0e04e5909f9558db64a27de97d41a4ee76498
parent 97e88d58df6ea96202874fc470b7d971ba9e8c09

DO NOT MERGE - resolved conflicts for merge of 97e88d58 to lmp-mr1-ub-dev

Change-Id: I4239d62278f3e89d4ae2e0a80a5bf3beb8bcc670

tests/tests/net/src/android/net/cts/LocalSocketTest.java

diff --git a/tests/tests/net/src/android/net/cts/LocalSocketTest.java b/tests/tests/net/src/android/net/cts/LocalSocketTest.java
index 865ec21..70d69c8 100644
--- a/tests/tests/net/src/android/net/cts/LocalSocketTest.java
+++ b/tests/tests/net/src/android/net/cts/LocalSocketTest.java
@@ -112,6 +112,7 @@
     }
 
     public void testAccessors() throws IOException{
+        final int INITIAL_SEND_BUFFER_SIZE = 1998;
         LocalSocket socket = new LocalSocket();
         LocalSocketAddress addr = new LocalSocketAddress("secondary");
 
@@ -126,8 +127,14 @@
         socket.setReceiveBufferSize(1999);
         assertEquals(1999 << 1, socket.getReceiveBufferSize());
 
-        socket.setSendBufferSize(3998);
-        assertEquals(3998 << 1, socket.getSendBufferSize());
+        socket.setSendBufferSize(INITIAL_SEND_BUFFER_SIZE);
+        int sendBufferSize = socket.getSendBufferSize();
+        if ((INITIAL_SEND_BUFFER_SIZE << 1) < sendBufferSize) {
+            socket.setSendBufferSize(sendBufferSize / 2);
+            assertEquals(sendBufferSize, socket.getSendBufferSize());
+        } else {
+            assertEquals(INITIAL_SEND_BUFFER_SIZE << 1, sendBufferSize);
+        }
 
         // Timeout is not support at present, so set is ignored
         socket.setSoTimeout(1996);