OSDN Git Service
Android (Google) Code Review [Mon, 19 Oct 2009 21:01:25 +0000 (17:01 -0400)]
Merge change I1f575e9e
* changes:
Improve error handling in InetAddress native code.
Elliott Hughes [Sat, 17 Oct 2009 00:25:34 +0000 (17:25 -0700)]
Improve error handling in InetAddress native code.
Fix a bug where we changed the return values of functions such
as byteArrayToSocketAddress without changing the logic in the
callers that's supposed to distinguish success and failure.
For simplicity, I've switch all of these functions over to
returning bool, and I've gone through all the callers to ensure
we're using the right check now. (This is the majority of the
diff.)
Also switch to throwing IllegalArgumentException instead of SocketException
when we find ourselves with a bad byte[] --- before we were throwing
a checked exception we weren't allowed to (from native code, which
can't actually be checked statically) and then trying to cover up
in Java.
I've also simply removed one case where we were trying to mask an
OutOfMemoryError with a SocketException.
I also removed dead code in socketAddressToString: this function's
sole caller always passed false for withPort. This makes the
temporary variable and the copying (which was unsafe) unnecessary.
In instances where I was already changing the code, I've removed
bogus "handle == 0" failures, but I'll come back and remove all
the other instances in another patch.
Since I was in connectSocketImpl, I've removed the dead second half
of that method.
Android (Google) Code Review [Fri, 16 Oct 2009 20:43:35 +0000 (16:43 -0400)]
Merge change I2e354493
* changes:
Update NIO and NIO char packages to Harmony 802921.
Jesse Wilson [Thu, 15 Oct 2009 22:01:39 +0000 (15:01 -0700)]
Update NIO and NIO char packages to Harmony 802921.
Notable changes:
- We don't use Harmony's new indexing for SelectorImpl. See the long bug
thread on Harmony's site, https://issues.apache.org/jira/browse/HARMONY-6312
This patch includes the latest Harmony changes to SelectorImpl, which
have been optimized since this patch was first created.
- Several uses of StringBuffer updated to use StringBuilder
- CharBuffer.read implementation changes
- Additional checking in CharsetEncoder
- Some inner classes made static
- Harmony changed their Charset impl from ICU to Java. We're sticking with ICU.
- Harmony added support for epoll. We're sticking with standard 'poll'.
commit
2ed6cb602a52f4681afbf1348928f1b0c36d914d
Merge:
8a74fca bcc5ec7
Author: Jesse Wilson <jessewilson@google.com>
Date: Fri Aug 14 15:14:10 2009 -0700
Merge branch 'nio_802921' into nio_dalvik
Conflicts:
libcore/nio/.classpath
libcore/nio/META-INF/MANIFEST.MF
libcore/nio/build.xml
libcore/nio/make/exclude.linux.x86.drl
libcore/nio/make/exclude.linux.x86.ibm
libcore/nio/make/exclude.linux.x86_64.drl
libcore/nio/src/main/java/java/nio/BaseByteBuffer.java
libcore/nio/src/main/java/java/nio/Buffer.java
libcore/nio/src/main/java/java/nio/BufferOverflowException.java
libcore/nio/src/main/java/java/nio/BufferUnderflowException.java
libcore/nio/src/main/java/java/nio/ByteBuffer.java
libcore/nio/src/main/java/java/nio/ByteOrder.java
libcore/nio/src/main/java/java/nio/CharArrayBuffer.java
libcore/nio/src/main/java/java/nio/CharBuffer.java
libcore/nio/src/main/java/java/nio/CharSequenceAdapter.java
libcore/nio/src/main/java/java/nio/CharToByteBufferAdapter.java
libcore/nio/src/main/java/java/nio/DirectByteBuffer.java
libcore/nio/src/main/java/java/nio/DirectByteBuffers.java
libcore/nio/src/main/java/java/nio/DoubleArrayBuffer.java
libcore/nio/src/main/java/java/nio/DoubleBuffer.java
libcore/nio/src/main/java/java/nio/DoubleToByteBufferAdapter.java
libcore/nio/src/main/java/java/nio/FloatArrayBuffer.java
libcore/nio/src/main/java/java/nio/FloatBuffer.java
libcore/nio/src/main/java/java/nio/FloatToByteBufferAdapter.java
libcore/nio/src/main/java/java/nio/HeapByteBuffer.java
libcore/nio/src/main/java/java/nio/IntArrayBuffer.java
libcore/nio/src/main/java/java/nio/IntBuffer.java
libcore/nio/src/main/java/java/nio/IntToByteBufferAdapter.java
libcore/nio/src/main/java/java/nio/InvalidMarkException.java
libcore/nio/src/main/java/java/nio/LongArrayBuffer.java
libcore/nio/src/main/java/java/nio/LongBuffer.java
libcore/nio/src/main/java/java/nio/LongToByteBufferAdapter.java
libcore/nio/src/main/java/java/nio/MappedByteBuffer.java
libcore/nio/src/main/java/java/nio/MappedByteBufferAdapter.java
libcore/nio/src/main/java/java/nio/ReadOnlyBufferException.java
libcore/nio/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java
libcore/nio/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java
libcore/nio/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadWriteCharArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
libcore/nio/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadWriteHeapByteBuffer.java
libcore/nio/src/main/java/java/nio/ReadWriteIntArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadWriteLongArrayBuffer.java
libcore/nio/src/main/java/java/nio/ReadWriteShortArrayBuffer.java
libcore/nio/src/main/java/java/nio/ShortArrayBuffer.java
libcore/nio/src/main/java/java/nio/ShortBuffer.java
libcore/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java
libcore/nio/src/main/java/java/nio/channels/AlreadyConnectedException.java
libcore/nio/src/main/java/java/nio/channels/AsynchronousCloseException.java
libcore/nio/src/main/java/java/nio/channels/ByteChannel.java
libcore/nio/src/main/java/java/nio/channels/CancelledKeyException.java
libcore/nio/src/main/java/java/nio/channels/Channel.java
libcore/nio/src/main/java/java/nio/channels/Channels.java
libcore/nio/src/main/java/java/nio/channels/ClosedByInterruptException.java
libcore/nio/src/main/java/java/nio/channels/ClosedChannelException.java
libcore/nio/src/main/java/java/nio/channels/ClosedSelectorException.java
libcore/nio/src/main/java/java/nio/channels/ConnectionPendingException.java
libcore/nio/src/main/java/java/nio/channels/DatagramChannel.java
libcore/nio/src/main/java/java/nio/channels/FileChannel.java
libcore/nio/src/main/java/java/nio/channels/FileLock.java
libcore/nio/src/main/java/java/nio/channels/FileLockInterruptionException.java
libcore/nio/src/main/java/java/nio/channels/GatheringByteChannel.java
libcore/nio/src/main/java/java/nio/channels/IllegalBlockingModeException.java
libcore/nio/src/main/java/java/nio/channels/IllegalSelectorException.java
libcore/nio/src/main/java/java/nio/channels/InterruptibleChannel.java
libcore/nio/src/main/java/java/nio/channels/NoConnectionPendingException.java
libcore/nio/src/main/java/java/nio/channels/NonReadableChannelException.java
libcore/nio/src/main/java/java/nio/channels/NonWritableChannelException.java
libcore/nio/src/main/java/java/nio/channels/NotYetBoundException.java
libcore/nio/src/main/java/java/nio/channels/NotYetConnectedException.java
libcore/nio/src/main/java/java/nio/channels/OverlappingFileLockException.java
libcore/nio/src/main/java/java/nio/channels/Pipe.java
libcore/nio/src/main/java/java/nio/channels/ReadableByteChannel.java
libcore/nio/src/main/java/java/nio/channels/ScatteringByteChannel.java
libcore/nio/src/main/java/java/nio/channels/SelectableChannel.java
libcore/nio/src/main/java/java/nio/channels/SelectionKey.java
libcore/nio/src/main/java/java/nio/channels/Selector.java
libcore/nio/src/main/java/java/nio/channels/ServerSocketChannel.java
libcore/nio/src/main/java/java/nio/channels/SocketChannel.java
libcore/nio/src/main/java/java/nio/channels/UnresolvedAddressException.java
libcore/nio/src/main/java/java/nio/channels/UnsupportedAddressTypeException.java
libcore/nio/src/main/java/java/nio/channels/WritableByteChannel.java
libcore/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java
libcore/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
libcore/nio/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java
libcore/nio/src/main/java/java/nio/channels/spi/AbstractSelector.java
libcore/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java
libcore/nio/src/main/java/org/apache/harmony/nio/AddressUtil.java
libcore/nio/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/IOUtil.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/SelectorImpl.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/SelectorProviderImpl.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
libcore/nio/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
libcore/nio/src/main/native/nio/shared/DirectBufferUtil.c
libcore/nio/src/main/native/nio/unix/exports.txt
libcore/nio/src/main/native/nio/unix/makefile
libcore/nio/src/main/native/nio/windows/makefile
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelLockingTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelWin32OnlyTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
libcore/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
libcore/nio_char/.classpath
libcore/nio_char/META-INF/MANIFEST.MF
libcore/nio_char/build.xml
libcore/nio_char/src/main/java/java/nio/charset/CharacterCodingException.java
libcore/nio_char/src/main/java/java/nio/charset/Charset.java
libcore/nio_char/src/main/java/java/nio/charset/CharsetDecoder.java
libcore/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java
libcore/nio_char/src/main/java/java/nio/charset/CoderMalfunctionError.java
libcore/nio_char/src/main/java/java/nio/charset/CoderResult.java
libcore/nio_char/src/main/java/java/nio/charset/CodingErrorAction.java
libcore/nio_char/src/main/java/java/nio/charset/IllegalCharsetNameException.java
libcore/nio_char/src/main/java/java/nio/charset/MalformedInputException.java
libcore/nio_char/src/main/java/java/nio/charset/UnmappableCharacterException.java
libcore/nio_char/src/main/java/java/nio/charset/UnsupportedCharsetException.java
libcore/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java
libcore/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java
libcore/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
libcore/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java
commit
8a74fca0d85c82a9d02a83d00fd028d9b09755f7
Author: Jesse Wilson <jessewilson@google.com>
Date: Thu Aug 13 16:03:25 2009 -0700
Dalvik Nio, Nio char
commit
bcc5ec78806787fbecab742e716fc0d63bcece5c
Author: Jesse Wilson <jessewilson@google.com>
Date: Thu Aug 13 16:01:06 2009 -0700
Nio, nio char 802921
commit
fc1e09e74aec8e49e0e23f13643deed1e9112af4
Author: Jesse Wilson <jessewilson@google.com>
Date: Thu Aug 13 15:48:17 2009 -0700
Nio, nio char 527399
Jesse Wilson [Fri, 16 Oct 2009 00:30:27 +0000 (17:30 -0700)]
Respond to impossible CloneNotSupportedExceptions with AssertionErrors.
See bug
2183132.
Android (Google) Code Review [Fri, 16 Oct 2009 15:23:14 +0000 (11:23 -0400)]
Merge change Id26b232b
* changes:
Fix Float.valueOf(String) OutOfMemoryExceptions.
Elliott Hughes [Thu, 15 Oct 2009 23:50:10 +0000 (16:50 -0700)]
Fix Float.valueOf(String) OutOfMemoryExceptions.
Apply http://issues.apache.org/jira/browse/HARMONY-6261, which was missed in
our recent luni merge.
Bug:
1957904
Android (Google) Code Review [Thu, 15 Oct 2009 22:31:59 +0000 (18:31 -0400)]
Merge change Iccd6c010
* changes:
Make the traige process for self-verification found divergence easier.
Ben Cheng [Thu, 15 Oct 2009 21:52:45 +0000 (14:52 -0700)]
Make the traige process for self-verification found divergence easier.
1. Automatically replay the code compilation with verbose mode turned on for
the offending compilation.
3. Mark the registers with divergence explicitly.
2. Print accurate operand names using the dataflow attributes. Constant values
are still printed for reference only.
3. Fixed a few correctness/style issues in self-verification code.
Jesse Wilson [Thu, 15 Oct 2009 20:45:21 +0000 (13:45 -0700)]
am
8673ee75: am
9a35ef1b: Guarantee deflaters get cleaned up, even if subclassed.
Merge commit '
8673ee75052e7398aa6f5925e968d6a0b2419be8'
* commit '
8673ee75052e7398aa6f5925e968d6a0b2419be8':
Guarantee deflaters get cleaned up, even if subclassed.
Jesse Wilson [Thu, 15 Oct 2009 20:36:21 +0000 (13:36 -0700)]
am
9a35ef1b: Guarantee deflaters get cleaned up, even if subclassed.
Merge commit '
9a35ef1b4b196f0479054993ab0eabac416c5214' into eclair-mr2-plus-aosp
* commit '
9a35ef1b4b196f0479054993ab0eabac416c5214':
Guarantee deflaters get cleaned up, even if subclassed.
Android (Google) Code Review [Thu, 15 Oct 2009 19:04:24 +0000 (15:04 -0400)]
Merge change I581bed77
* changes:
Add a memory barrier.
Jesse Wilson [Thu, 15 Oct 2009 18:46:52 +0000 (11:46 -0700)]
Guarantee deflaters get cleaned up, even if subclassed.
See bug
2186927
Android (Google) Code Review [Thu, 15 Oct 2009 18:28:09 +0000 (14:28 -0400)]
Merge change I11b31b39
* changes:
Fix icu4jni Resources ("Locale") to not expose its internals.
Andy McFadden [Thu, 15 Oct 2009 18:24:54 +0000 (11:24 -0700)]
Add a memory barrier.
Looks like an appropriate place for one.
Elliott Hughes [Wed, 14 Oct 2009 22:40:27 +0000 (15:40 -0700)]
Fix icu4jni Resources ("Locale") to not expose its internals.
We shouldn't expose internal arrays without copying.
Bug:
2102273
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:12:50 +0000 (16:12 -0700)]
Jean-Baptiste Queru [Wed, 14 Oct 2009 23:02:09 +0000 (16:02 -0700)]
merge from open-source master
Elliott Hughes [Wed, 14 Oct 2009 19:12:11 +0000 (12:12 -0700)]
Fix build.
Add missing files from https://android-git.corp.google.com/g/29998.
Android (Google) Code Review [Wed, 14 Oct 2009 18:42:05 +0000 (14:42 -0400)]
Merge change Ic8d6b3cb
* changes:
Fix Constructor and Method to not expose their internals.
Android (Google) Code Review [Wed, 14 Oct 2009 17:48:59 +0000 (13:48 -0400)]
Merge change Ia0e7b60d
* changes:
Remove incorrect definition of nested local variables.
Android (Google) Code Review [Wed, 14 Oct 2009 17:12:35 +0000 (13:12 -0400)]
Merge change I0e52b194
* changes:
Bug fixing for NumberFormat and BigDecimal.
Elliott Hughes [Wed, 14 Oct 2009 17:07:42 +0000 (10:07 -0700)]
Fix build.
Work around apicheck bug.
Android (Google) Code Review [Wed, 14 Oct 2009 15:44:10 +0000 (11:44 -0400)]
Merge change I3a0b1f8c
* changes:
Update libcore/security to Harmony r823222.
Android (Google) Code Review [Wed, 14 Oct 2009 14:23:05 +0000 (10:23 -0400)]
Merge change Ic89dfdd8
* changes:
Bump "public" version from 1.1.0 to 1.2.0.
Android (Google) Code Review [Wed, 14 Oct 2009 14:22:50 +0000 (10:22 -0400)]
Merge change I0d6fff2d
* changes:
Avoid JDWP hang on nested thread suspension.
Android (Google) Code Review [Wed, 14 Oct 2009 07:42:03 +0000 (03:42 -0400)]
Merge change I9297389b
* changes:
Udating luni to Harmony r823222.
Ben Cheng [Wed, 14 Oct 2009 06:09:01 +0000 (23:09 -0700)]
Remove incorrect definition of nested local variables.
Elliott Hughes [Sat, 10 Oct 2009 00:21:46 +0000 (17:21 -0700)]
Update libcore/security to Harmony r823222.
Squashed commit of the following:
commit
e3083dde77b71fa817c8a52d9edafcb6325cfc25
Author: Elliott Hughes <enh@google.com>
Date: Fri Oct 9 13:10:11 2009 -0700
security_dalvik
commit
0fc0101e5dbfb3e3044702579ab8087a4e07984a
Author: Elliott Hughes <enh@google.com>
Date: Fri Oct 9 13:09:48 2009 -0700
security_527399
Elliott Hughes [Wed, 14 Oct 2009 01:18:21 +0000 (18:18 -0700)]
Fix Constructor and Method to not expose their internals.
We shouldn't expose internal arrays without copying. Behavior confirmed
by testing against RI.
Also connect up the dalvik ThreadsTest test that had fallen by the wayside.
Bug:
2102273
Andy McFadden [Tue, 13 Oct 2009 23:19:22 +0000 (16:19 -0700)]
Bump "public" version from 1.1.0 to 1.2.0.
Also, send correct version in JDWP VirtualMachine.Version packet.
Andy McFadden [Tue, 13 Oct 2009 23:04:31 +0000 (16:04 -0700)]
Avoid JDWP hang on nested thread suspension.
With jdb, you can suspend a thread multiple times. If you try to
execute a method -- which requires resuming a thread that has been
stopped at a breakpoint -- the VM currently only does a single "resume",
which means the thread is still suspended, and the JDWP thread hangs
waiting for it.
This adds a check to prevent the hang.
For bug
2183735.
Android (Google) Code Review [Tue, 13 Oct 2009 20:45:17 +0000 (16:45 -0400)]
Merge change Ied79ff0c
* changes:
Accept JitOff as a legal state in the debug interpreter when JIT is configured.
Ben Cheng [Tue, 13 Oct 2009 20:26:40 +0000 (13:26 -0700)]
Accept JitOff as a legal state in the debug interpreter when JIT is configured.
Andy McFadden [Tue, 13 Oct 2009 20:06:03 +0000 (13:06 -0700)]
Add JDWP ReferenceType.ClassObject handler.
For bug
2157236.
Android (Google) Code Review [Tue, 13 Oct 2009 19:24:25 +0000 (15:24 -0400)]
Merge change I60282050
* changes:
Add implementation of JDWP ClassType.NewInstance
Brett Chabot [Tue, 13 Oct 2009 18:57:48 +0000 (11:57 -0700)]
am
fef7556f: am
3238cc2a: am
32f89821: Merge change 26044 into donut-gms
Merge commit '
fef7556f058d0d17b30180c03387558bc59d3105'
* commit '
fef7556f058d0d17b30180c03387558bc59d3105':
Remove tests.api.java.io.FileTest#test_delete as known failure.
Brett Chabot [Tue, 13 Oct 2009 18:57:43 +0000 (11:57 -0700)]
am
4ebfaec4: am
98f0612b: am
c4d33d9d: Fix ClassLoaderTest to work on DEXPREOPT builds.
Merge commit '
4ebfaec453ae79e3ac1d7ff30cbc9f2d3beef2d1'
* commit '
4ebfaec453ae79e3ac1d7ff30cbc9f2d3beef2d1':
Fix ClassLoaderTest to work on DEXPREOPT builds.
Andy McFadden [Fri, 2 Oct 2009 22:56:26 +0000 (15:56 -0700)]
Add implementation of JDWP ClassType.NewInstance
Add a handler for the ClassType.NewInstance request, and some bits of
plumbing to go with it.
For bug
2157236.
Android (Google) Code Review [Mon, 12 Oct 2009 21:51:09 +0000 (17:51 -0400)]
Merge change I8f61592d
* changes:
Set the debug interpreter entry point properly on the self-verification path.
Jesse Wilson [Mon, 12 Oct 2009 21:07:16 +0000 (14:07 -0700)]
Bug fixing for NumberFormat and BigDecimal.
1. Fixed the bug that DecimalFormat does not handle multiplier.
2. Fixed the bug that DecimalFormat does not handle precision.
This is a copy of the original Eclair change,
https://android-git.corp.google.com/g/26297
Bug:
1897917.
Android (Google) Code Review [Mon, 12 Oct 2009 21:17:00 +0000 (17:17 -0400)]
Merge change I6618182f
* changes:
Fix CoreTestRunner to not run filtered-out tests.
Ben Cheng [Mon, 12 Oct 2009 20:46:55 +0000 (13:46 -0700)]
Set the debug interpreter entry point properly on the self-verification path.
Also fix the encoding for SFP/DFP register names to make self-verification
happy on FP benchmarks.
Elliott Hughes [Mon, 12 Oct 2009 21:08:50 +0000 (14:08 -0700)]
Fix CoreTestRunner to not run filtered-out tests.
https://android-git.corp.google.com/g/29284 broke test filtering by accidentally
passing the unfiltered test suite to super.doRun.
Android (Google) Code Review [Mon, 12 Oct 2009 20:54:08 +0000 (16:54 -0400)]
Merge change I1acdca65
* changes:
Fix memory corruption.
Android (Google) Code Review [Mon, 12 Oct 2009 20:43:15 +0000 (16:43 -0400)]
Merge change Iff8a3e91
* changes:
Adding timeouts to HttpsURLConnectionTest.
Jesse Wilson [Mon, 12 Oct 2009 19:58:01 +0000 (12:58 -0700)]
Adding timeouts to HttpsURLConnectionTest.
See bug http://b/issue?id=
2180571
Jesse Wilson [Mon, 12 Oct 2009 19:31:09 +0000 (12:31 -0700)]
Fix memory corruption.
Lorenzo Colitti [Mon, 12 Oct 2009 18:35:56 +0000 (11:35 -0700)]
am
e652b123: Make sure res is NULL if getaddrinfo fails.
Merge commit '
e652b123d2d65d40e5f51c0145cc453ea88631dc'
* commit '
e652b123d2d65d40e5f51c0145cc453ea88631dc':
Make sure res is NULL if getaddrinfo fails.
Jesse Wilson [Sat, 10 Oct 2009 04:53:23 +0000 (21:53 -0700)]
Adding a timeout for standard out as well as standard error.
Jesse Wilson [Fri, 9 Oct 2009 22:26:15 +0000 (15:26 -0700)]
Udating luni to Harmony r823222.
Highlights:
- InputStream.skip concurrency issue
- "better" messages in bound exceptions for streams and arrays
- prefer fewer writes to underlying streams (using byte[] buffers)
- Rename subclasses to not reuse names from their superclasses
- PlatformAddressFactory.allocMap bugfix
Plus some spelling fixes, style fixes, serial version UIDs and other
boilerplate improvements.
Android (Google) Code Review [Sat, 10 Oct 2009 01:21:46 +0000 (21:21 -0400)]
Merge change I164613f2
* changes:
Rewrite Support_Exec to support timeouts on waiting processes.
Jesse Wilson [Sat, 10 Oct 2009 00:41:52 +0000 (17:41 -0700)]
Rewrite Support_Exec to support timeouts on waiting processes.
Also rewriting SupportExec to use ProcessBuilder rather
than Runtime.exec(). Changed callers to use the ProcessBuilder
directly rather than calling-through chained methods.
Android (Google) Code Review [Fri, 9 Oct 2009 23:51:32 +0000 (19:51 -0400)]
Merge change Ic98d470a
* changes:
Remove the intermediate representation in getNetworkInterfaces.
Android (Google) Code Review [Fri, 9 Oct 2009 22:47:36 +0000 (18:47 -0400)]
Merge change I6239d93b
* changes:
Fix the docs for the no-arg Random() constructor to better reflect reality, and make the constructors more resilient with respect to subclassing by using System.identityHashCode() instead of Object.hashCode(), and also by not calling overridable methods.
Dan Bornstein [Fri, 9 Oct 2009 20:09:34 +0000 (13:09 -0700)]
Fix the docs for the no-arg Random() constructor to better reflect reality,
and make the constructors more resilient with respect to subclassing by
using System.identityHashCode() instead of Object.hashCode(), and also by
not calling overridable methods.
Change-Id: I6239d93bb46876ef1c4a5e155a6dc1ac6fab4eae
Android (Google) Code Review [Fri, 9 Oct 2009 20:27:42 +0000 (16:27 -0400)]
Merge change I0e98511f
* changes:
Do not initialize the JIT if it is not the designated execution mode.
Android (Google) Code Review [Fri, 9 Oct 2009 20:16:49 +0000 (16:16 -0400)]
Merge change I98acebf9
* changes:
Disable SMALL_BUFFERS and CUTTHROUGH, as SSLSession test fails with these flags.
Ben Cheng [Fri, 9 Oct 2009 18:55:30 +0000 (11:55 -0700)]
Do not initialize the JIT if it is not the designated execution mode.
Dan Bornstein [Thu, 8 Oct 2009 00:33:46 +0000 (17:33 -0700)]
Minor tweak for compatibility with BSD: Use MAP_ANON instead of MAP_ANONYMOUS.
The former is deprecated on Linux, but it is equivalent, and
MAP_ANONYMOUS isn't valid at all on BSD. (The alternative for BSD
compatibility is to use #ifdefs, but that seems gratuitously
heavyweight to me.)
Change-Id: I9c0b2cc78c4d7edc633487d5b0dde5b2f928247e
Android (Google) Code Review [Fri, 9 Oct 2009 16:49:15 +0000 (12:49 -0400)]
Merge change I5ccdf0be
* changes:
Fix for "Compiler thread shutdown should switch out of VMWAIT"
Nagendra Modadugu [Fri, 9 Oct 2009 01:34:48 +0000 (18:34 -0700)]
Disable SMALL_BUFFERS and CUTTHROUGH, as SSLSession test fails with these flags.
Elliott Hughes [Thu, 8 Oct 2009 23:56:37 +0000 (16:56 -0700)]
Squashed commit of the following:
commit
07d78447c89a11265bf909ab6bcc315c1a784281
Author: Elliott Hughes <enh@google.com>
Date: Thu Oct 8 16:38:26 2009 -0700
text_dalvik
commit
c390506ce060c705b6c1b04fb1e737617de1bd8a
Author: Elliott Hughes <enh@google.com>
Date: Thu Oct 8 16:38:22 2009 -0700
text_802921
Ben Cheng [Thu, 8 Oct 2009 23:09:49 +0000 (16:09 -0700)]
Fix for "Compiler thread shutdown should switch out of VMWAIT"
Jesse Wilson [Thu, 8 Oct 2009 07:25:33 +0000 (00:25 -0700)]
Tools to push code back upstream.
Android (Google) Code Review [Thu, 8 Oct 2009 18:29:37 +0000 (14:29 -0400)]
Merge change I685130ae
* changes:
JNI Delete* and Release* _are_ allowed while an exception is pending.
Brett Chabot [Thu, 8 Oct 2009 18:18:20 +0000 (11:18 -0700)]
am
3238cc2a: am
32f89821: Merge change 26044 into donut-gms
Merge commit '
3238cc2a901ed6e0e3bb11fa601913c2ed09ddb7' into eclair-plus-aosp
* commit '
3238cc2a901ed6e0e3bb11fa601913c2ed09ddb7':
Remove tests.api.java.io.FileTest#test_delete as known failure.
Brett Chabot [Thu, 8 Oct 2009 18:18:10 +0000 (11:18 -0700)]
am
98f0612b: am
c4d33d9d: Fix ClassLoaderTest to work on DEXPREOPT builds.
Merge commit '
98f0612b22111dd9e2d23b171b9059582cc44991' into eclair-plus-aosp
* commit '
98f0612b22111dd9e2d23b171b9059582cc44991':
Fix ClassLoaderTest to work on DEXPREOPT builds.
Brett Chabot [Thu, 8 Oct 2009 17:55:14 +0000 (10:55 -0700)]
am
3238cc2a: am
32f89821: Merge change 26044 into donut-gms
Merge commit '
3238cc2a901ed6e0e3bb11fa601913c2ed09ddb7' into eclair-mr2
* commit '
3238cc2a901ed6e0e3bb11fa601913c2ed09ddb7':
Remove tests.api.java.io.FileTest#test_delete as known failure.
Brett Chabot [Thu, 8 Oct 2009 17:55:09 +0000 (10:55 -0700)]
am
98f0612b: am
c4d33d9d: Fix ClassLoaderTest to work on DEXPREOPT builds.
Merge commit '
98f0612b22111dd9e2d23b171b9059582cc44991' into eclair-mr2
* commit '
98f0612b22111dd9e2d23b171b9059582cc44991':
Fix ClassLoaderTest to work on DEXPREOPT builds.
Android (Google) Code Review [Thu, 8 Oct 2009 17:50:00 +0000 (13:50 -0400)]
Merge change I9c147b84
* changes:
Fix various bugs found when debugger is attached to the VM.
Brett Chabot [Thu, 8 Oct 2009 17:44:24 +0000 (10:44 -0700)]
am
32f89821: Merge change 26044 into donut-gms
Merge commit '
32f8982116e5155bc3c75c86e3c861cab1a848be' into eclair
* commit '
32f8982116e5155bc3c75c86e3c861cab1a848be':
Remove tests.api.java.io.FileTest#test_delete as known failure.
Brett Chabot [Thu, 8 Oct 2009 17:44:19 +0000 (10:44 -0700)]
am
c4d33d9d: Fix ClassLoaderTest to work on DEXPREOPT builds.
Merge commit '
c4d33d9d89444d86808be7072e0548007d98a49f' into eclair
* commit '
c4d33d9d89444d86808be7072e0548007d98a49f':
Fix ClassLoaderTest to work on DEXPREOPT builds.
Jesse Wilson [Thu, 8 Oct 2009 00:20:15 +0000 (17:20 -0700)]
Fixing the JUnit runner to output Ant-compatible XML.
We can use this with our continuous build to track test
failure changes over time.
Ben Cheng [Wed, 7 Oct 2009 23:41:46 +0000 (16:41 -0700)]
Fix various bugs found when debugger is attached to the VM.
See b/
2161257 for details.
Elliott Hughes [Wed, 7 Oct 2009 23:33:23 +0000 (16:33 -0700)]
JNI Delete* and Release* _are_ allowed while an exception is pending.
See "Exceptions" in our own documentation:
http://android.git.kernel.org/?p=platform/dalvik.git;a=blob_plain;f=docs/jni-tips.html;hb=HEAD
This is also true of the RI, though the spec sometimes implies otherwise.
Here's the canonical reference:
http://java.sun.com/docs/books/jni/html/design.html#2193
Elliott Hughes [Wed, 7 Oct 2009 22:04:52 +0000 (15:04 -0700)]
Fix several leaks in OpenSSL JNI cipher suites code.
I first spotted the missing ReleaseStringUTFChars, but then noticed all
the duplication in the cipher suites functions, and noticed that no
copy appeared to be completely correct. The factored-out replacements
shouldn't leak, and should check all error conditions.
Android (Google) Code Review [Wed, 7 Oct 2009 06:51:47 +0000 (02:51 -0400)]
Merge change I492dd3f7
* changes:
Enable SMALL_BUFFERS and HANDSHAKE_CUTTHROUGH for SSL connections.
Nagendra Modadugu [Tue, 6 Oct 2009 22:52:53 +0000 (15:52 -0700)]
Enable SMALL_BUFFERS and HANDSHAKE_CUTTHROUGH for SSL connections.
Elliott Hughes [Tue, 6 Oct 2009 22:31:35 +0000 (15:31 -0700)]
Remove duplication between readv and writev.
This also means we don't pin the three int arrays for the duration
of the syscall.
Elliott Hughes [Tue, 6 Oct 2009 21:08:53 +0000 (14:08 -0700)]
Don't use GetPrimitiveArrayCritical around network operations.
This code seems to have been using GetPrimitiveArrayCritical to
work around the fact that it was supply JNI_ABORT on release,
where it really wanted GetByteArrayElements and to keep its
changes (since the whole point of the byte[] was to keep state
between calls).
Elliott Hughes [Tue, 6 Oct 2009 20:01:12 +0000 (13:01 -0700)]
Remove the intermediate representation in getNetworkInterfaces.
This gets rid of a lot of unnecessary complexity by going straight from
the kernel's representation to the Java representation, without the useless
C structs in between.
Android (Google) Code Review [Tue, 6 Oct 2009 18:27:47 +0000 (14:27 -0400)]
Merge change Ia4c68278
* changes:
Remove dead code.
Android (Google) Code Review [Tue, 6 Oct 2009 17:36:11 +0000 (13:36 -0400)]
Merge change I40159068
* changes:
Use icu4jni_error more consistently.
Elliott Hughes [Tue, 6 Oct 2009 17:18:34 +0000 (10:18 -0700)]
Remove dead code.
Lorenzo Colitti [Fri, 2 Oct 2009 19:45:21 +0000 (12:45 -0700)]
Make sure res is NULL if getaddrinfo fails.
Android (Google) Code Review [Tue, 6 Oct 2009 00:15:01 +0000 (20:15 -0400)]
Merge change I7aabd791
* changes:
Refactor java_net_NetworkInterface.cpp for clarity.
Elliott Hughes [Mon, 5 Oct 2009 23:01:35 +0000 (16:01 -0700)]
Use icu4jni_error more consistently.
In BidiWrapperInterface.c, replace check_fail with icu4jni_error for better
error reporting.
In CollationInterface.c, make sure we call icu4jni_error *after* calling
the function that may or may not return an error.
Elliott Hughes [Sat, 3 Oct 2009 00:20:00 +0000 (17:20 -0700)]
Refactor java_net_NetworkInterface.cpp for clarity.
All I wanted to do was remove the SOCKERR_ mess, but things got out of hand.
There's still plenty of stuff that could be cleaned up, but nothing that can't
wait. I'm only doing this to make things easier for the IPv6 changes.
This patch:
* removes the SOCKERR_ mess which was causing vague "Operation failed"
IOExceptions; we now use the actual errno value of whatever caused the failure.
* simplifies memory management so we don't have to do lots of cleanup on
every exit from each function.
* simplified fd management for the same reason.
* reduces the use of the intermediate structure, going straight to Java objects
in places. (This is the unfinished work: we should get rid of the intermediate
representation. It's not useful.)
* replaces structInToJavaAddress and structInToInetAddress with a call to the
better socketAddressToInetAddress from OSNetworkSystem.cpp.
* uses more intention-revealing variable and function names.
* removes attempts to throw exceptions when perfectly good exceptions have
already been thrown.
* removes filtering of interfaces that aren't up. The RI doesn't do this
filtering, there's no reason to do it, and it's always going to be a race
condition anyway.
* removes untrue comments.
* removes a lot of inexplicably empty lines.
Elliott Hughes [Mon, 5 Oct 2009 20:48:44 +0000 (13:48 -0700)]
Switch to TEMP_FAILURE_RETRY now it's moved to bionic.
(The same EINTR_RETRY macro that used to be here has moved to <unistd.h>, so
we don't need another copy. EINTR_RETRY is a nicer name, I think, but
TEMP_FAILURE_RETRY is the GNU-compatible name.)
Android (Google) Code Review [Fri, 2 Oct 2009 20:19:46 +0000 (16:19 -0400)]
Merge change Idc84bb2b
* changes:
Fix trace builder to not confuse self-verification.
Ben Cheng [Fri, 2 Oct 2009 19:58:52 +0000 (12:58 -0700)]
Fix trace builder to not confuse self-verification.
Lorenzo Colitti [Fri, 2 Oct 2009 19:45:21 +0000 (12:45 -0700)]
Make sure res is NULL if getaddrinfo fails.
Android (Google) Code Review [Fri, 2 Oct 2009 19:37:32 +0000 (15:37 -0400)]
Merge change I4bf8618f
* changes:
Add back missing shared libraries used by executable in link command. These libraries are linked though dependencies of other libraries. While that works, it is not the right thing to do.
Doug Kwan [Fri, 2 Oct 2009 18:21:07 +0000 (11:21 -0700)]
Add back missing shared libraries used by executable in link command. These
libraries are linked though dependencies of other libraries. While that works,
it is not the right thing to do.
Elliott Hughes [Wed, 30 Sep 2009 20:26:11 +0000 (13:26 -0700)]
Remove adb networking support from dalvik/libcore.
There's more to be removed from other projects, but this should probably
come out first.
Bug:
1122968
Android (Google) Code Review [Fri, 2 Oct 2009 14:52:14 +0000 (10:52 -0400)]
Merge change Id5ccf4bc
* changes:
Catch bad getStackTrace() calls.
Android (Google) Code Review [Fri, 2 Oct 2009 00:37:18 +0000 (20:37 -0400)]
Merge change I9d8f66aa
* changes:
Switch java_net_NetworkInterface.c to C++.
Elliott Hughes [Fri, 2 Oct 2009 00:20:14 +0000 (17:20 -0700)]
Switch java_net_NetworkInterface.c to C++.
(I have a bigger change to make to this file, but the web claims that it's
best to keep renames in minimally small patches so git doesn't get confused.)
Andy McFadden [Fri, 2 Oct 2009 00:10:47 +0000 (17:10 -0700)]
Catch bad getStackTrace() calls.
Normally Throwable.getStackTrace() can't be called until after there's a
stack trace, but with a debugger you can call it during construction.
We weren't expecting that and the VM went boom.