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

Change-Id: I9c21d9f5dbc269bb0066d184895c9dca691a1f98
This commit is contained in:
Daniel Xie
2015-06-03 14:02:53 -07:00

View File

@@ -112,6 +112,7 @@ public class LocalSocketTest extends AndroidTestCase{
}
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 @@ public class LocalSocketTest extends AndroidTestCase{
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);