8ef423ca0e43afa10f169bbd5df9004ada5daa74 |
|
01-Sep-2017 |
Victor Chang <vichang@google.com> |
8u121-b13 integration for java.net - Document Android changes Bug: 64065632 Test: cts-tradefed run cts-dev --module CtsLibcoreOjTestCases Change-Id: I0308ddf9f24072a36ff32ccb0a3781d69599644f
|
6975f84c2ed72e1e26d20190b6f318718c849008 |
|
01-Mar-2017 |
Tobias Thierer <tobiast@google.com> |
Make Android patch docs in ojluni more consistent with style guide This CL consists of an automated and a manual part (originally reviewed as separate CLs, then squashed together before submitting in order to minimize the number of times each Android-changed line is touch, since that makes future git archaeology on these simpler). Automated part: Run the following command (performs regex replacements): find ojluni -name \*\.java | xargs sed -i \ -e 's/Android[- ]changed/Android-changed/ig' \ -e 's/Android-changed :/Android-changed:/g' \ -e 's/Android-changed \(BEGIN\|END\)/\1 Android-changed/g' \ -e 's/Android-changed - /Android-changed: /g' \ -e 's/Android[- ]removed/Android-removed/ig' \ -e 's/Android-removed :/Android-removed:/g' \ -e 's/Android-removed \(BEGIN\|END\)/\1 Android-removed/g' \ -e 's/Android-removed - /Android-removed: /g' \ -e 's/Android[- ]added/Android-added/ig' \ -e 's/Android-added :/Android-added:/g' \ -e 's/Android-added \(BEGIN\|END\)/\1 Android-added/g' \ -e 's/Android-added - /Android-added: /g' \ -e 's/----- \(BEGIN\|END\) android\( -----\)\?/\1 Android-changed/g' \ -e 's/\/\* \(BEGIN\|END\) Android-changed \*\//\/\/ \1 Android-changed/g' Manual part: Move BEGIN Android-* lines out of block comments Some Android-{changed,removed,added} lines occurred inside block comments. This CL targets places in ojluni that contained the String "* BEGIN Android-" Changes made by this CL include: - Move the "BEGIN Android-" line into a line comment (the style guide mandates that "Android-" lines are always in line comments). In many cases, that line comment is immediately followed by a block comment holding commented-out upstream code. - Add corresponding "// END Android-" line comments, where missing. - Drop documented import changes altogether. These create noise for little benefit: (1.) Most import problems will be found at compile time (2.) They generally correspond to documented changes elsewhere in the file. - In most cases, the phrasing of comments and the decision whether to keep commented out upstream code was not changed by this CL. - Some additional tweaks were made in line with the style guide. No attempt was made to: - Verify that commented-out upstream code actually matches the current upstream. - Make any fixes (eg. to comments) that would have required git archaeology (looking up historic commits). Bug: 35841464 Test: make droid cts update-api Change-Id: Ibc60979cb6061cfb0e9c7096cc9dcab30ddfa733
|
7247f6a70e89efb4696aaaffaf7a0325604a6e06 |
|
19-Jan-2017 |
Yi Kong <yikong@google.com> |
Pull upstream fix for CVE-2016-5552 to replace our local change that is essentially equivalent logic. The upstream fix additionally fixes a flaw which if there is more than one @ in the authority portion, then user and host are set to null (ignored as malformed). Upstream change: Merge http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/1e8c18ddcab1 Test: libcore.java.net.URLTest#testMultipleUserField Test: CtsLibcoreTestCases Bug: 33351987 Change-Id: If5ab229f951c872aecb34834f0a52153f3f0fa26 (cherry picked from commit 2e3689a5019e781fb361cc67982926beaaa969c2)
|
2e3689a5019e781fb361cc67982926beaaa969c2 |
|
19-Jan-2017 |
Yi Kong <yikong@google.com> |
Pull upstream fix for CVE-2016-5552 to replace our local change that is essentially equivalent logic. The upstream fix additionally fixes a flaw which if there is more than one @ in the authority portion, then user and host are set to null (ignored as malformed). Upstream change: Merge http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/1e8c18ddcab1 Test: libcore.java.net.URLTest#testMultipleUserField Test: CtsLibcoreTestCases Bug: 33351987 Change-Id: If5ab229f951c872aecb34834f0a52153f3f0fa26
|
f98287d57549ccaae7b6e8dec9feadd4e0d413c3 |
|
19-Oct-2016 |
Yi Kong <yikong@google.com> |
Fix URL parser may return wrong host name Due to a missing bound check in parseURL, it may include part of the fragment in the authority field, and returns wrong host name. Bug: 31858037 Test: libcore.java.net.URLTest#testFragmentWith{Slash,Query} Change-Id: I1fc39907cc67f6d674a3790070833123fdef9414 (cherry picked from commit 78a4344540081fd229b188504d2fee820b7d452a)
|
78a4344540081fd229b188504d2fee820b7d452a |
|
19-Oct-2016 |
Yi Kong <yikong@google.com> |
Fix URL parser may return wrong host name Due to a missing bound check in parseURL, it may include part of the fragment in the authority field, and returns wrong host name. Bug: 31858037 Test: libcore.java.net.URLTest#testFragmentWith{Slash,Query} Change-Id: I1fc39907cc67f6d674a3790070833123fdef9414
|
7f4b1b8935a58d3f44351083cf5ef19045761de3 |
|
11-Aug-2016 |
Yi Kong <yikong@google.com> |
Merge OpenJDK 8 java.net (part 2) Partial import of upstream jdk8u60 that does not introduce behavioural differences: * Remove unused imports * Remove unused private fields * Adding final modifier to some private fields * Update copyright header * Use of generics * Cosmetic changes This also imports upstream change to remove NetUtils, which does not change behavior for Android as we does not use SecurityManager. No functional change. Bug: 29067535 Test: CTS java.net tests Change-Id: I5c864a77f384f237ddac77d8c4579b291dcddb6b
|
49965c1dc9da104344f4893a05e45795a5740d20 |
|
30-Jun-2016 |
Ganesh Mahendran <opensource.ganesh@gmail.com> |
remove x attribute of java file java file does not need x attribute. This patch removes it. Change-Id: I2a7170d99f4bee7a7b819621c84dd197ded37fa2 Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
|
3a6411ec91b24e73f36301d0075bc7b052894ae9 |
|
14-Jun-2016 |
Yi Kong <yikong@google.com> |
Merge OpenJDK 8 java.net (part 1) Partial import of upstream jdk8u60 that does not introduce behavioural differences: * Various documentation fixes * Change HTML <code> and <tt> to {@code} annotation. * Generics * Serialization UID * Code layout No functional change. Bug: 29067535 Change-Id: I7fc29692b949a27b528d1b25dfb3f0993005dfd2
|
57acf7ac56d7fed06c96a1451fe7d8570dbb2977 |
|
04-Apr-2016 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Fix java.net.URL#getPath regression Pre-openJdk java.net.URL#getPath was always removing the stray trailing "?" from the path. This change makes sure that openJdk based one behaves the same way. Bug: 27444667 Change-Id: Ie96ff08c17edebbed0de16ed9dd434a474722cd4 (cherry picked from commit e56459a04d499071dd682bbb906946798b71eaa5)
|
e56459a04d499071dd682bbb906946798b71eaa5 |
|
04-Apr-2016 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Fix java.net.URL#getPath regression Pre-openJdk java.net.URL#getPath was always removing the stray trailing "?" from the path. This change makes sure that openJdk based one behaves the same way. Bug: 27444667 Change-Id: Ie96ff08c17edebbed0de16ed9dd434a474722cd4
|
f35c08530f77a744646e6e988d330a68f3af6940 |
|
02-Feb-2016 |
Narayan Kamath <narayan@google.com> |
URL: Remove toUriLenient. This code is no longer used by okhttp. Note that UriCodec is now no longer used by libcore but is used by android.net.Uri in the frameworks. (cherry picked from commit fe6fe17d1ca75ee039df7ab93314f3f1e068794f) Change-Id: I30a423b1d6f6c4d5c4a2f65679898c4b8a5bd1b0
|
fe6fe17d1ca75ee039df7ab93314f3f1e068794f |
|
02-Feb-2016 |
Narayan Kamath <narayan@google.com> |
URL: Remove toUriLenient. This code is no longer used by okhttp. Note that UriCodec is now no longer used by libcore but is used by android.net.Uri in the frameworks. Change-Id: I9590e2cf41268943984cc37a96b35ba1d003d86e
|
b93dbaedd71dae5c1e4fb2faba863acbde1080c2 |
|
01-Feb-2016 |
Narayan Kamath <narayan@google.com> |
URL: Avoid network I/O in hashCode and equals. bug: 26798800 bug: 26895969 Change-Id: I7f019808dc07fc3feb70ff5aa78294b66ba138ae
|
2c87ad3a45cecf9e344487cad1abfdebe79f2c7c |
|
21-Dec-2015 |
Narayan Kamath <narayan@google.com> |
Update file headers. Change-Id: I8149f41585768a1a4b72ab7bb4a1452376c05cc2
|
06fc5c380e77f61adcf02305c5bbea9eac129583 |
|
21-Jul-2015 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
URL parsing fixes for libcore.java.net.URLTests Change-Id: Ia245622dd000d3e131dd28179e58ecb125b2f458
|
e4dc89b637bb77dc97fb33a84339fbfe83abe567 |
|
21-Jul-2015 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Further URL fixes for libcore.java.net.OldURLTest Change-Id: I8c58ed37e1078c2eaa5c52601d150900624eb88a
|
a53c889dff2031f9eb20594c1a172c6a228c0298 |
|
21-Jul-2015 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Fix URL.path handling. Change-Id: Id1246130ad8218848a8574fb9c6d12e219e705fd
|
f7ab2bc37debba91864bfec6572a3e7bbe994c58 |
|
06-May-2015 |
Piotr Jastrzebski <haaawk@google.com> |
Use OpenJdk implementation of java.net.* - Add FileURLConnection. - NetworkUtilities : Update field names in JNI. - Suppress a few libcore tests that rely on internal implementation details. - Remove code that loads the net library (not needed on android). - DatagramSocket : Add setNetworkInterface method. - HttpCookie : make parse & field public - Inet4Address / Inet6Address : Add getAddressInternal. - InetAddress : Add methods required by frameworks/base, particularly those required to deal with net-ids and scope ids. - URI : Add UriCodec static members for AUTHORITY_ENCODER and friends. - URL : Add toUriLenient - URLStreamHandler : Add a toExternalForm variant that optionally escapes illegal chars. - Inet4AddressImpl.c : Unconditionally define HAS_GLIBC_GETHOSTBY_R Change-Id: Ic51f863941f5d954ed6cf86309cc610e711d54bd
|
51b1b6997fd3f980076b8081f7f1165ccc2a4008 |
|
16-Feb-2015 |
Piotr Jastrzebski <haaawk@google.com> |
Initial import of OpenJdk files. Create new libcore/ojluni directory with src/main/java and src/main/native subdirectiories. Build ojluni into core-oj jar. Use openjdk classes from java.awt.font package. Copy all files from jdk/src/share/classes and jdk/src/solaris/classes directories in openjdk into libcore/ojluni/src/main/java. Copy following native files from openjdk to libcore/ojluni/src/main/native: jdk/src/solaris/native/java/io/canonicalize_md.c build/linux-amd64/include/classfile_constants.h jdk/src/share/native/java/net/DatagramPacket.c jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c jdk/src/share/native/java/lang/Double.c jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c jdk/src/solaris/native/java/io/FileDescriptor_md.c jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c jdk/src/share/native/java/io/FileInputStream.c jdk/src/solaris/native/sun/nio/ch/FileKey.c jdk/src/solaris/native/java/io/FileOutputStream_md.c jdk/src/solaris/native/java/io/FileSystem_md.c jdk/src/share/native/java/lang/Float.c jdk/src/share/native/java/net/Inet4Address.c jdk/src/solaris/native/java/net/Inet4AddressImpl.c jdk/src/share/native/java/net/Inet6Address.c jdk/src/solaris/native/java/net/Inet6AddressImpl.c jdk/src/share/native/java/net/InetAddress.c jdk/src/solaris/native/java/net/InetAddressImplFactory.c jdk/src/share/native/java/io/io_util.c jdk/src/solaris/native/sun/nio/ch/IOUtil.c jdk/src/share/native/java/io/io_util.h jdk/src/solaris/native/java/io/io_util_md.c jdk/src/solaris/native/java/io/io_util_md.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/java_io_FileDescriptor.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_FileInputStream.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_FileOutputStream.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_FileSystem.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_ObjectStreamClass.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_io_UnixFileSystem.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Double.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Float.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Integer.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Long.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Runtime.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Shutdown.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_StrictMath.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_String.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_System.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Thread.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/java_lang_Throwable.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_DatagramPacket.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet4Address.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet4AddressImpl.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet6Address.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_Inet6AddressImpl.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_InetAddress.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_InetAddressImplFactory.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_NetworkInterface.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_PlainDatagramSocketImpl.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_PlainSocketImpl.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_SocketInputStream.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_SocketOptions.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/java_net_SocketOutputStream.h jdk/src/share/native/java/lang/java_props.h jdk/src/solaris/native/java/lang/java_props_md.c jdk/src/share/native/java/util/zip/Adler32.c as java_util_zip_Adler32.c jdk/src/share/native/java/util/zip/CRC32.c as java_util_zip_CRC32.c build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_CRC32.h jdk/src/share/native/java/util/zip/Deflater.c as java_util_zip_Deflater.c build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_Deflater.h jdk/src/share/native/java/util/zip/Inflater.c as java_util_zip_Inflater.c build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_Inflater.h jdk/src/share/native/java/util/zip/ZipFile.c as java_util_zip_ZipFile.c build/linux-amd64/tmp/sun/java.util.zip/zip/CClassHeaders/java_util_zip_ZipFile.h jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h jdk/src/share/native/common/jlong.h jdk/src/solaris/native/common/jlong_md.h jdk/src/share/native/common/jni_util.c jdk/src/share/native/common/jni_util.h jdk/src/solaris/native/common/jni_util_md.c jdk/src/share/javavm/export/jvm.h jdk/src/solaris/javavm/export/jvm_md.h jdk/src/solaris/native/java/net/linux_close.c jdk/src/share/native/sun/misc/NativeSignalHandler.c jdk/src/solaris/native/sun/nio/ch/NativeThread.c jdk/src/share/native/java/net/net_util.c jdk/src/share/native/java/net/net_util.h jdk/src/solaris/native/java/net/net_util_md.c jdk/src/solaris/native/java/net/net_util_md.h jdk/src/solaris/native/java/net/NetworkInterface.c jdk/src/share/native/sun/nio/ch/nio.h jdk/src/solaris/native/sun/nio/ch/nio_util.h jdk/src/share/native/java/io/ObjectStreamClass.c jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c jdk/src/solaris/native/java/net/PlainSocketImpl.c jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c jdk/src/share/native/java/lang/Runtime.c jdk/src/share/native/java/lang/Shutdown.c jdk/src/share/native/sun/misc/Signal.c jdk/src/solaris/native/java/net/SocketInputStream.c jdk/src/solaris/native/java/net/SocketOutputStream.c jdk/src/share/native/java/lang/StrictMath.c jdk/src/share/native/java/lang/String.c build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/sun_misc_NativeSignalHandler.h build/linux-amd64/tmp/java/java.lang/java/CClassHeaders/sun_misc_Signal.h build/linux-amd64/tmp/sun/java.net/net/CClassHeaders/sun_net_spi_DefaultProxySelector.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_FileChannelImpl.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_FileDispatcherImpl.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_FileKey.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_IOStatus.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_IOUtil.h build/linux-amd64/tmp/java/java.nio/nio/CClassHeaders/sun_nio_ch_NativeThread.h jdk/src/share/native/java/lang/System.c jdk/src/share/native/java/lang/Thread.c jdk/src/share/native/java/lang/Throwable.c jdk/src/solaris/native/java/io/UnixFileSystem_md.c jdk/src/solaris/native/java/lang/UNIXProcess_md.c jdk/src/share/native/java/util/zip/zip_util.c jdk/src/share/native/java/util/zip/zip_util.h Change-Id: Ib237df4e1b7b5b4d9f12e74d189e6ec9eed3c31d
|