diff options
author | Tobias Thierer <tobiast@google.com> | 2020-01-31 14:27:34 +0000 |
---|---|---|
committer | Tobias Thierer <tobiast@google.com> | 2020-01-31 14:32:54 +0000 |
commit | 1a4ed5296a0bf76bc0d68f2ba3dd38745e64810d (patch) | |
tree | e0659d089de0ac295833cf09dbbdc943ffe86beb /annotations/generate_annotated_java_files.py | |
parent | 65c8f94fe44d11528cf1b72d5e2577a32de90bdf (diff) |
NetworkInterface: Clarify change marker.
The comment "specified to return null if no network interface" in
NetworkInterface.java derives from upstream OpenJDK 8u121-b13.
Upstream's getAll() method returns null rather than an array of length
0 in the case of no network interfaces. I suspect that the upstream
comment refers to getAll() returning null, but because it appeared
after an Android-changed marker, was not double-commented out, the null
check that it referred to wasn't present, and the following line
returned null, it appeared as if it referred to that.
This CL adds commented-out upstream code and an extra comment layer
to the "specified to return null" comment, to avoid this
misunderstanding.
Test: tools/upstream/upstream-diff java.net.NetworkInterface
Change-Id: I64f8919f6a3cce53f332ae8f3062b82d9927cd08
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions