commit 5ebf501b41bb2392fa7881f882fab0fe1a0cf796
author Daniel Xie <dxie@google.com> Wed Jun 03 14:02:53 2015 -0700
committer Daniel Xie <dxie@google.com> Wed Jun 03 21:21:34 2015 +0000
tree b55901001cda5ebb0b884693cb2441f2ea4a50b0
parent 762d111509a0daba5f19cf1af8411a38684507e1
parent e81d049a94f694adaab63fb5eedd4dc553508ee0

resolved conflicts for merge of 42b3de74 to lmp-mr1-app-dev

Change-Id: I9c21d9f5dbc269bb0066d184895c9dca691a1f98

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

diff --git a/tests/cts/net/src/android/net/cts/LocalSocketTest.java b/tests/cts/net/src/android/net/cts/LocalSocketTest.java
index 865ec21..70d69c8 100644
--- a/tests/cts/net/src/android/net/cts/LocalSocketTest.java
+++ b/tests/cts/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);