commit 2d22fa9b07f2db449162c0de894faee288f6d85b
author Amith Dsouza <amithds@google.com> Tue Sep 15 17:00:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 15 17:00:13 2015 +0000
tree b0d6ca40bde4f2dbf8a69bd982bf053825434ab4
parent 624951463c7fa9e548ab51a0344bbd485cafc80f
parent 2e4ce593e3b6c611783bc660f95e2e783e004cd3

am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev

* commit '2e4ce593e3b6c611783bc660f95e2e783e004cd3':
  LocalSocketTest.testAccessors: fix the *SendBufferSize* test

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