969e52ff2fa0125d2f493df0511b292cb8c4107d - SHIFTPHONES/android_libcore

commit	969e52ff2fa0125d2f493df0511b292cb8c4107d	[log] [tgz]
author	Neil Fuller <nfuller@google.com>	Wed Jan 20 13:26:09 2016 -0800
committer	Neil Fuller <nfuller@google.com>	Thu Apr 21 15:37:04 2016 +0000
tree	7d1fa4dce5fd04529f797b0e81fda0f2d5d0ac59
parent	df2dc04a5a03f9dc7b5be2c0df93e90ba5c8a7aa [diff]

Allow some rounding on SO_TIMEOUT values

Kernels can round the value in use depending on the HZ setting.
This change allows up to 10ms of slop between the SO_TIMEOUT
value set and the one returned.

Bug: 26583607
Change-Id: I527987de20a6e10172656e1f0beeaf63419ffd77
(cherry picked from commit 6566167989735858978d062a4385104ce5eca7e3)

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java[diff]
harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ServerSocketTest.java[diff]
harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTest.java[diff]
luni/src/test/java/libcore/java/net/OldServerSocketTest.java[diff]
luni/src/test/java/libcore/java/net/OldSocketTest.java[diff]
luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java[diff]

6 files changed

tree: 7d1fa4dce5fd04529f797b0e81fda0f2d5d0ac59