diff options
author | Tobias Thierer <tobiast@google.com> | 2018-06-01 11:04:53 +0100 |
---|---|---|
committer | Tobias Thierer <tobiast@google.com> | 2018-06-01 14:38:34 +0100 |
commit | e7f026f8f9c8f3296e60217750ec3672e1cfbd41 (patch) | |
tree | 7e0dcf6820f3a24d9bd2e38e6b3b901bd2c6c1fb /annotations/generate_annotated_java_files.py | |
parent | c348eae9c0674938c019ca3ffd14aa228e4a3db4 (diff) |
FileChannelImpl.map(): don't ignore IOExceptions on non-regular files.
This CL completes verification of FileChannelImpl against OpenJDK 8u121-b13.
Context:
CL [1] (Dec 2012) changed FileChannelImpl.map() to suppress IOExceptions
thrown by truncate() if the FileDescriptor was not referring a regular
file.
When FileChannelImpl was switched to an OpenJDK based implementation,
CL [2] (Jul 2015) replicated the same change to keep the (then) current
behavior.
Per discussion on draft CL [3], the original change was done to not
have to rely on native code in a test; but that test was then never
converted to .java code. Further, android.system.Os might have been a
better place to expose missing functionality (there's currently Os.mmap()
but no way to turn the resulting long / void * into a ByteBuffer).
This CL completely reverts the behavior change and goes back to RI
behavior of not suppressing IOExceptions that happen for truncate() on
file descriptors that do not represent regular files. Hence, this CL
also drops the tests introduced by [1].
This CL replaces a previously proposed partial revert from draft CL [3].
[1] 385c6f4303341beb9b091b6d252811b7ca3b9f42 http://r.android.com/48530
[2] libcore commit 0f7f0c999e751ab883a247e1409dcc8730c87b9f
("Fixes for libcore.java.nio.BufferTest", July 2015)
[3] http://r.android.com/697248 (unsubmitted draft CL)
Bug: 77513071
Test: CtsLibcoreTestCases
Change-Id: I5dbedea8cbf11ce4b90497407fa5f1e77a8a6480
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions