summaryrefslogtreecommitdiff
path: root/ojluni/src/main/java/jdk/net/ExtendedSocketOptions.java
Commit message (Collapse)AuthorAgeFilesLines
* Verify the rest of jdk.* against upstream OpenJDK 8u121-b13.Tobias Thierer2018-07-051-1/+2
| | | | | | | | | | | | Add change markers for the commenting-out of @jdk.Exported. This annotation does not exist in OpenJDK 9, so the Android patches will go away if/when Android integrates changes from OpenJDK 9. Bug: 35910877 Test: Treehugger Change-Id: I6828aafd55c535c658cd095920577ae870ba47aa
* Import upstream change: Support Solaris SO_FLOW_SLA socket optionYi Kong2016-06-281-0/+60
Upstream Change: 8032808: Support Solaris SO_FLOW_SLA socket option Reviewed-by: alanb, chegar http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/7f04532ee859 The change has no effect for Linux/Android, however we keep it to minimize local diff. Bug: 29067535 Change-Id: I3748377ef382545424a6af720fc97d204f677d09