| 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
|
| 2c0c75bb3c933b4cc03e9fbe0c30df1e4be1cc48 |
|
23-Nov-2016 |
Yi Kong <yikong@google.com> |
Include source IP address in socket timeout exceptions
... to help debuggability.
Bug: 25488386
Test: CtsLibcoreTestCases
Change-Id: I2e9844ad9a3895f6c1463f32f1318146a8f8c468
|
| 48e205e5e0bc55b5c7b11df445da39c5be890623 |
|
11-Oct-2016 |
Yi Kong <yikong@google.com> |
Implement root-less ICMP for InetAddress#isReachable
IPPROTO_ICMP socket kind allows sending and receiving ICMP Echo
messages without priviledges.
Test: libcore.java.net.InetAddressTest
Bug: 31926888
Bug: http://code.google.com/p/android/issues/detail?id=20106
Change-Id: I97e908695a3e04ac11841acbe2c887f26e6b8910
|
| b11d8b52b4ea85ab56a033fc76b21bf3b50a1b3e |
|
12-Oct-2016 |
Yi Kong <yikong@google.com> |
Rewrite getHostByAddr0 using Libcore.os
Test: CTS
Bug: 28609551
Change-Id: Ifaa29daf84f61bccec070c453098407c939b96d9
|
| 2be229c284db4293a86200fa800886fed137e567 |
|
03-Oct-2016 |
Yi Kong <yikong@google.com> |
Move InetAddress#isReachable away from JNI
This commit also removes the code that attempt sending ICMP echo since
this requires root permission and does not work for Android apps.
This commit does not implement root-less ICMP. A follow-up change will
implement the protocol.
Bug: 28609551
Test: CTS
Change-Id: I35df60d98972e451a68ee3a90c0b09a0a11b3c10
|
| 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
|
| fe8d46c16e53822545b3c37bb7636abf2c342074 |
|
22-Feb-2016 |
Narayan Kamath <narayan@google.com> |
Revert "Revert "InetAddress: Don't throw SocketException from isReachable.""
This reverts commit 6bec79c64211b7849e1c947dc2b089ab5b356dc9.
Change-Id: Ia3e47a9469f32a2e9777dcb8b3a5cb0c5e7fd6c9
|
| 6bec79c64211b7849e1c947dc2b089ab5b356dc9 |
|
22-Feb-2016 |
Narayan Kamath <narayan@google.com> |
Revert "InetAddress: Don't throw SocketException from isReachable."
This reverts commit 21f8cbbf61d14ee8df7e31718826a7038feefb31.
This accidentally included some unreviewed (but good) code.
Change-Id: Ie232dd93d8cde496d9f78c398944cd68dda7df8d
|
| 21f8cbbf61d14ee8df7e31718826a7038feefb31 |
|
16-Feb-2016 |
Narayan Kamath <narayan@google.com> |
InetAddress: Don't throw SocketException from isReachable.
If something goes wrong, just state that the address is unreachable.
This fixes InetAddressTest.testIsReachable. The test was failing in
quite a convoluted manner - it was testing that isReachable did not
throw on any of the network interfaces on the system. However, we did
throw for interface = dummy0 because bind() returned EINVAL on the
iface's (link local) address.
(cherry picked from commit 838dc8ab4b456d91e56b46f7deb76a8f97145563)
bug: 27265678
Change-Id: I4530b761f157b9c2b5967d64e141424ce09957e0
|
| 838dc8ab4b456d91e56b46f7deb76a8f97145563 |
|
16-Feb-2016 |
Narayan Kamath <narayan@google.com> |
InetAddress: Don't throw SocketException from isReachable.
If something goes wrong, just state that the address is unreachable.
This fixes InetAddressTest.testIsReachable. The test was failing in
quite a convoluted manner - it was testing that isReachable did not
throw on any of the network interfaces on the system. However, we did
throw for interface = dummy0 because bind() returned EINVAL on the
iface's (link local) address.
Change-Id: Id7bdcf7318b6b4eaa92f9caaba38e86a580cc84b
|
| 5427c8d283752ae3c41fb0bb083d562060c5be08 |
|
19-Jan-2016 |
Narayan Kamath <narayan@google.com> |
Remove Inet6AddressImpl.<clinit>.
These classes have odd dependency chains, with InetAddress relying
on Inet6AddressImpl which depends on two of InetAddress's subclasses.
bug: 26700324
Change-Id: Id655b3b50310acd0f1dcfca371fe415d3a0dfc03
|
| d960ef32a57a91e4ea0976a2bbd97b8ec0fd2cf0 |
|
19-Jan-2016 |
Narayan Kamath <narayan@google.com> |
Always clone the return value of InetAddress#getAllByName.
Also move the responsibility for cloning to InetAddress so that
we can make sure we clone things consistently.
Change-Id: I93ea6096aebeca5df9b39e355bb4051ac38015c6
|
| c2614bb1297234d89f1a428a8b589bb1373a68dd |
|
06-Jan-2016 |
Narayan Kamath <narayan@google.com> |
Inet6Address : Clean up and add block-guard checks.
Removes a significant of duplicated code. The main goal of this
change is to move most of the actual implementation into
Inet6AddressImpl instead of having things split between InetAddress
and Inet6AddressImpl. Note that parseNumericAddress remains in
InetAddress for now since it's called from the frameworks.
bug: 25861497
Change-Id: I263c276ae8f7d5be8fcf0d34441f0e0702e1b6b3
|
| 2c87ad3a45cecf9e344487cad1abfdebe79f2c7c |
|
21-Dec-2015 |
Narayan Kamath <narayan@google.com> |
Update file headers.
Change-Id: I8149f41585768a1a4b72ab7bb4a1452376c05cc2
|
| c98b29f5ebcbee599583a12fec134df74015e597 |
|
12-Nov-2015 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Remove dead code in Inet4AddressImpl
And remove dependency on gethostbyaddr_r, openJDK
works fine on bionic without any additions.
Change-Id: I3e013093218ba405352d663a99372ff6c7f378c5
|
| dfb465c97689e9007be0569fca805ea2c728f37d |
|
24-Aug-2015 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Use IPv6 loopback address as the default.
Very simillar to modification in anyLocalAddress.
Android seems to prefer IPv4 addresses with the
exception of 'any' and 'localhost' addresses.
+ InetAddress.getLocalHost is expected to
return IPv4 address as well.
Change-Id: I8fb27e13cec5b3181db174a60c9ffaeb04042eb9
|
| 4a2df4b5bc2a7b752d0bd790f28a1d63dac89919 |
|
20-Jul-2015 |
Przemyslaw Szczepaniak <pszczepaniak@google.com> |
Fixes for libcore.java.net.OldSocketTest
java.net.preferIPv6Addresses=false, with
an exception in anyLocalAddress, which returns
a IPv6 "::".
Change-Id: I5192981e13b99ec2b1756eb7f75df1f3c9723550
|
| 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
|