summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2018-03-29 00:01:31 +0100
committerTobias Thierer <tobiast@google.com>2018-04-03 14:00:45 +0100
commitbe3ab5e212f74d6294137148a066eca0af3f728f (patch)
tree5dcfe5eebdd2d04cc3cce9506ebd2bb8f47dab4c /annotations/generate_annotated_java_files.py
parent381e39a907566ad31cf401b47b264fc97aed76d6 (diff)
Partially verify Android patches for sun.nio.ch.FileChannelImpl.
This CL adds and improves some change markers, and also integrates a bugfix in truncate() that was missed in the update from OpenJDK 8u60 to 8u121-b13. - annotate additions for CloseGuard support - annotate additions for BlockGuard support note: From what I can see, position() won't block yet commit 5873edf853a48362e8ee4e75181f654d0b88b8ef added BlockGuard invocations. I've kept the behavior for now since it's already present in released versions of Android. - missing markers "Allocate a DirectByteBuffer directly.". From commit fe0e5d3e460de87d24e0224ef10b089289355c47 - tweak marker "Ignore failed truncation for non-regular files." Introduced by commit 0f7f0c999e751ab883a247e1409dcc8730c87b9f. - missing marker "Move clinit code to JNI registration functions." From commit f9d2599c4341d07938392d0d3f23a302755d4f93. - missing removal marker "Unused method getMappedBufferPool()." - already removed in initial import - Integrate missing bugfix for FileChannelImpl.truncate(). Upstream bug: JDK-8137121: (fc) Infinite loop FileChannel.truncate was fixed for OpenJDK 8u72 but was missed in Android's update from 8u60 to 8u121-b13. The buggy code cast the result of nd.truncate() (a long) to int, which led to an infinite loop when that typecast overflowed to -3, the value of IOStatus.INTERRUPTED. Upstream OpenJDK has a testng regression test "LoopingTruncate", but this CL does not integrate it. Bug: 74377400 Test: Treehugger Change-Id: Idf6343a79fea4d3b2aebfffd892082c9e88c7712
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions