commit 545799ef30155f078a03f196218f8ef5a3551ca1
author Daniel Xie <dxie@google.com> Wed Jun 03 16:44:59 2015 -0700
committer Daniel Xie <dxie@google.com> Wed Jun 03 16:44:59 2015 -0700
tree 77f0e3df378c8a752c5be5797a1e56a45267fe2a
parent 4dd7fbee4e0c51ef4e4b60dc44641f7745c7057f
parent 1a927f46dcc43dc13ae0661cf0067eae920ff6ed

resolved conflicts for merge of 1a927f46 to lmp-mr1-modular-dev

Change-Id: I2070627dc3858b2baefcfdb0e975cfb9fc50b7a0

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 0a4bc0d..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(1998);
-        assertEquals(1998 << 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);