OSDN Git Service
Ben Cheng [Fri, 2 Oct 2009 19:58:52 +0000 (12:58 -0700)]
Fix trace builder to not confuse self-verification.
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.
Android (Google) Code Review [Fri, 2 Oct 2009 00:07:17 +0000 (20:07 -0400)]
Merge change I3bc71eab
* changes:
:: is a valid local address on a newly-created socket if IPv6 is preferred.
Lorenzo Colitti [Thu, 1 Oct 2009 19:24:40 +0000 (12:24 -0700)]
:: is a valid local address on a newly-created socket if IPv6 is preferred.
Lorenzo Colitti [Thu, 1 Oct 2009 20:47:10 +0000 (13:47 -0700)]
am
ae8d0254: am
0c0cfd5c: Merge change I96cd6f5b into eclair
Merge commit '
ae8d0254dd69392dae9c922462ca2a01944b6eef'
* commit '
ae8d0254dd69392dae9c922462ca2a01944b6eef':
Make the socket test accept ::1 as a valid result for
Lorenzo Colitti [Thu, 1 Oct 2009 20:47:04 +0000 (13:47 -0700)]
Lorenzo Colitti [Thu, 1 Oct 2009 20:46:58 +0000 (13:46 -0700)]
am
003d7f8d: am
e851c562: Merge change Iea75a523 into eclair
Merge commit '
003d7f8da66ec53b5dbece36308197dc7a932e3e'
* commit '
003d7f8da66ec53b5dbece36308197dc7a932e3e':
Fixes for socket options on multicast sockets.
Android (Google) Code Review [Thu, 1 Oct 2009 20:35:06 +0000 (16:35 -0400)]
Merge change I2cdad38a
* changes:
Update archive to Harmony r820767.
Jesse Wilson [Thu, 1 Oct 2009 20:16:51 +0000 (13:16 -0700)]
Update archive to Harmony r820767.
Jesse Wilson [Thu, 1 Oct 2009 19:22:38 +0000 (12:22 -0700)]
am
aa4320a4: am
1131d3da: Merge change Ie2e14dde into eclair
Merge commit '
aa4320a4fb27684bd70cfb4d82feca3845ad272e'
* commit '
aa4320a4fb27684bd70cfb4d82feca3845ad272e':
Remove @KnownFailure tags for tests that pass.
Jesse Wilson [Thu, 1 Oct 2009 19:22:26 +0000 (12:22 -0700)]
am
2b791cc2: am
910363bd: Merge change Ib5dc3f1f into eclair
Merge commit '
2b791cc256e80f93fef7db2157f1cee202133201'
* commit '
2b791cc256e80f93fef7db2157f1cee202133201':
Fixing a lame test that was relying on hashmap iteration order.
Jesse Wilson [Thu, 1 Oct 2009 19:20:48 +0000 (12:20 -0700)]
am
a20c6d23: am
b5b7f4ba: Merge change I9899be9d into eclair
Merge commit '
a20c6d2347224d89dced471e61a36610699b7e71'
* commit '
a20c6d2347224d89dced471e61a36610699b7e71':
Fixing a Harmony regression in ObjectInputStream.
Jesse Wilson [Thu, 1 Oct 2009 19:17:17 +0000 (12:17 -0700)]
am
18ae1786: am
ffa33efc: Merge change I75630000 into eclair
Merge commit '
18ae1786b572d7385cbddd7da3167e190b952ded'
* commit '
18ae1786b572d7385cbddd7da3167e190b952ded':
Fixing tests that exercise SecurityManager plus stack inspection.
Android (Google) Code Review [Thu, 1 Oct 2009 19:15:08 +0000 (15:15 -0400)]
Merge change I76ecf19c
* changes:
Use jniThrowException instead of FindClass/ThrowNew.
Jesse Wilson [Thu, 1 Oct 2009 18:50:21 +0000 (11:50 -0700)]
am
4b304284: am
7f51bfee: Merge change I86898f45 into eclair
Merge commit '
4b30428421d4ad93d9e6fc34bc0190a5097dc4a6'
* commit '
4b30428421d4ad93d9e6fc34bc0190a5097dc4a6':
Fix BigInteger math bugs.
Elliott Hughes [Thu, 1 Oct 2009 18:20:29 +0000 (11:20 -0700)]
Use jniThrowException instead of FindClass/ThrowNew.
Always use our best-of-breed code for throwing exceptions. The remaining
callers of Throw have good reason, and the only caller of ThrowNew is
now JNIHelp.c (jniThrowException) itself.
Ben Cheng [Thu, 1 Oct 2009 05:53:44 +0000 (22:53 -0700)]
Fix a memory disambiguation and a SFP/DFP assembling bug in the JIT.
Lorenzo Colitti [Thu, 1 Oct 2009 04:16:39 +0000 (21:16 -0700)]
am
0c0cfd5c: Merge change I96cd6f5b into eclair
Merge commit '
0c0cfd5ce4a26187fb910ba701d0021989103a25' into eclair-plus-aosp
* commit '
0c0cfd5ce4a26187fb910ba701d0021989103a25':
Make the socket test accept ::1 as a valid result for
Lorenzo Colitti [Thu, 1 Oct 2009 04:15:21 +0000 (21:15 -0700)]
am
f94c5d77: More multicast fixes.
Merge commit '
f94c5d77ab659bfc1644b524fc006f24cbf6f694' into eclair-plus-aosp
* commit '
f94c5d77ab659bfc1644b524fc006f24cbf6f694':
More multicast fixes.
Lorenzo Colitti [Thu, 1 Oct 2009 04:12:23 +0000 (21:12 -0700)]
am
e851c562: Merge change Iea75a523 into eclair
Merge commit '
e851c562ee5eb514135b5066553fcef6b0e5c333' into eclair-plus-aosp
* commit '
e851c562ee5eb514135b5066553fcef6b0e5c333':
Fixes for socket options on multicast sockets.
Android (Google) Code Review [Thu, 1 Oct 2009 02:27:13 +0000 (22:27 -0400)]
Merge change I96cd6f5b into eclair
* changes:
Make the socket test accept ::1 as a valid result for InetAddress.getByName(null) if the system is set to prefer IPv6 addresses.
Lorenzo Colitti [Thu, 1 Oct 2009 01:31:29 +0000 (18:31 -0700)]
Make the socket test accept ::1 as a valid result for
InetAddress.getByName(null) if the system is set to prefer IPv6 addresses.
Change-Id: I96cd6f5b632994b73af13e341cf6f684f6eee4cd
Lorenzo Colitti [Thu, 1 Oct 2009 00:51:26 +0000 (17:51 -0700)]
More multicast fixes.
1. Make native code properly set network interface indexes that are used for
new-style multicast socket options.
2. For IP_MULTICAST_IF, check that the address is IPv4, not the socket.
3. Remove a @KnownFailure annotation for a test that now passes.
This removes one test error and changes it into a more benign failure. The
remaining test failures seem to be due to Linux bening permissive about which
interfaces you can receive multicast traffic on, which is probably good enough
for now.
Change-Id: Id1fddee338addcfce821672b983485c7dd4983d4
Android (Google) Code Review [Wed, 30 Sep 2009 23:37:27 +0000 (19:37 -0400)]
Merge change Iea75a523 into eclair
* changes:
Fixes for socket options on multicast sockets.
Lorenzo Colitti [Wed, 30 Sep 2009 22:49:22 +0000 (15:49 -0700)]
Fixes for socket options on multicast sockets.
1. Properly pass get/setsockopt the pointer to the socket option instead of the
pointer to the pointer to the option. This was not caught at compile time
because it's a void *.
2. Handle IPv4 multicast addresses on IPv6 sockets. This is important because
current devices create IPv6 sockets by default.
3. Use the proper options for IPv6 multicast (i.e., IPV6_{ADD,DROP}_MEMBERSHIP
instead of IP_{ADD,DROP}_MEMBERSHIP)
4. Use integers instead of bytes when getting or setting the multicast TTL
because that's what the Linux kernel uses.
These fix 10 of the 11 MulticastSocketTest failures. Also, minor changes:
1. Add ifdefd-out logging functions for get/setsockopt.
2. Change all instances of IPPROTO_{IP,IPv6} to SOL_{IP,IPV6} in get/setsockopt
calls. Even though the values are the same (so the code worked), this way is
more correct.
Change-Id: Iea75a523d7e71f0b361a42c0e39d3ef075dc7ff4
Jesse Wilson [Wed, 30 Sep 2009 23:22:15 +0000 (16:22 -0700)]
am
1131d3da: Merge change Ie2e14dde into eclair
Merge commit '
1131d3da4e3d3df7f608fb0078ec67d14035ff25' into eclair-plus-aosp
* commit '
1131d3da4e3d3df7f608fb0078ec67d14035ff25':
Remove @KnownFailure tags for tests that pass.
Android (Google) Code Review [Wed, 30 Sep 2009 22:49:43 +0000 (18:49 -0400)]
Merge change Ie2e14dde into eclair
* changes:
Remove @KnownFailure tags for tests that pass.
Jesse Wilson [Wed, 30 Sep 2009 22:39:36 +0000 (15:39 -0700)]
Remove @KnownFailure tags for tests that pass.
Also cleanup tests.api.java.io.SerializationStressTest4#test_writeObject_Proxy
Elliott Hughes [Wed, 30 Sep 2009 22:25:29 +0000 (15:25 -0700)]
Simplify FileInputStream.skip to match the RI.
The RI throws IOException on any non-seekable stream, including stdin.
This patch removes harmony's special-case hack for stdin, and the native
cruft that wasn't even necessary if you did want a special hack for
stdin.
Bug:
1542253
Jesse Wilson [Wed, 30 Sep 2009 22:33:46 +0000 (15:33 -0700)]
am
910363bd: Merge change Ib5dc3f1f into eclair
Merge commit '
910363bd8d50c2a5558a71e47377928265c1219e' into eclair-plus-aosp
* commit '
910363bd8d50c2a5558a71e47377928265c1219e':
Fixing a lame test that was relying on hashmap iteration order.
Android (Google) Code Review [Wed, 30 Sep 2009 22:21:58 +0000 (18:21 -0400)]
Merge change Ib5dc3f1f into eclair
* changes:
Fixing a lame test that was relying on hashmap iteration order.
Jesse Wilson [Wed, 30 Sep 2009 22:09:17 +0000 (15:09 -0700)]
Fixing a lame test that was relying on hashmap iteration order.
Jesse Wilson [Wed, 30 Sep 2009 21:57:18 +0000 (14:57 -0700)]
am
b5b7f4ba: Merge change I9899be9d into eclair
Merge commit '
b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99' into eclair-plus-aosp
* commit '
b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99':
Fixing a Harmony regression in ObjectInputStream.
Android (Google) Code Review [Wed, 30 Sep 2009 21:50:18 +0000 (17:50 -0400)]
Merge change I9899be9d into eclair
* changes:
Fixing a Harmony regression in ObjectInputStream.
Jesse Wilson [Wed, 30 Sep 2009 21:44:20 +0000 (14:44 -0700)]
Fixing a Harmony regression in ObjectInputStream.
We check the field type against the instance being
populated and not the field descriptor on the wire.
The root cause is a bug in Harmony which we should
send upstream.
Jesse Wilson [Wed, 30 Sep 2009 20:40:05 +0000 (13:40 -0700)]
am
ffa33efc: Merge change I75630000 into eclair
Merge commit '
ffa33efc2cae574aefbc2867dd4a7e5413282e3c' into eclair-plus-aosp
* commit '
ffa33efc2cae574aefbc2867dd4a7e5413282e3c':
Fixing tests that exercise SecurityManager plus stack inspection.
Elliott Hughes [Wed, 30 Sep 2009 20:37:24 +0000 (13:37 -0700)]
Fix build (don't rely on transitive #include).
The sim-eng build wasn't picking up <string.h> for memcpy(3).
Android (Google) Code Review [Wed, 30 Sep 2009 20:31:20 +0000 (16:31 -0400)]
Merge change I75630000 into eclair
* changes:
Fixing tests that exercise SecurityManager plus stack inspection.
Jesse Wilson [Wed, 30 Sep 2009 18:57:49 +0000 (11:57 -0700)]
Fixing tests that exercise SecurityManager plus stack inspection.
The tests were both broken previously. They both relied on having
specific bootloader classes in their call stack.
Elliott Hughes [Sun, 27 Sep 2009 21:26:34 +0000 (14:26 -0700)]
Throw meaningful IOException instances from native code.
The Java side of OSFileSystem was throwing IOExceptions with no detail
message. If we throw from the native side instead, we can supply
meaningful explanations. This turned up a couple of bugs:
* read, readDirect, readv, writev, and ttyRead would only throw IOException
if they returned < -1, which is impossible. (writev was probably a copy & paste
from readv, and the reads were probably confused by the impedence mismatch
between Unix's use of 0 to mean end of file and -1 to mean error, and Java's
use of -1 for end of file.)
* inconsistent checking for null byte[]s passed in.
* read and write would retry on EINTR, but readDirect and writeDirect wouldn't.
* we'd silently truncate seek/lock/truncate offsets that didn't fit in 32 bits;
we now throw an IOException instead.
It also means a few native functions become "void" because errors are now
reported by throwing exceptions, and the Java functions that used to call them
are no longer needed.
Also change ProcessManager to use jniThrowIOException, remove the unused
throwIOExceptionStr from OSNetworkSystem.cpp, and remove the KnownFailure from
FileTest's test_delete, now we have a fixed version of yaffs that won't
rmdir(2) non-empty directories.
Bug:
1542253
Android (Google) Code Review [Wed, 30 Sep 2009 15:24:55 +0000 (11:24 -0400)]
Merge change I866cc5d6
* changes:
Improve run-core-tests.
Jesse Wilson [Wed, 30 Sep 2009 05:43:10 +0000 (22:43 -0700)]
am
7f51bfee: Merge change I86898f45 into eclair
Merge commit '
7f51bfee5fc5fb34fe89f3d74f7fd40d834c0fc2' into eclair-plus-aosp
* commit '
7f51bfee5fc5fb34fe89f3d74f7fd40d834c0fc2':
Fix BigInteger math bugs.
Android (Google) Code Review [Wed, 30 Sep 2009 05:35:12 +0000 (01:35 -0400)]
Merge change I86898f45 into eclair
* changes:
Fix BigInteger math bugs.
Jesse Wilson [Wed, 30 Sep 2009 05:30:14 +0000 (22:30 -0700)]
Fix BigInteger math bugs.
This initializes the internal representation before doing left shifts.
I'd originally missed this in the first Harmony update; change 20002.
Android (Google) Code Review [Wed, 30 Sep 2009 04:19:55 +0000 (00:19 -0400)]
Merge change I09239e36
* changes:
Report all RegisterNatives failures, not just the first.
Elliott Hughes [Wed, 30 Sep 2009 01:35:43 +0000 (18:35 -0700)]
Report all RegisterNatives failures, not just the first.
(It seems that when I make one mistake, I generally make
several at once.)
Elliott Hughes [Wed, 30 Sep 2009 01:05:33 +0000 (18:05 -0700)]
Improve run-core-tests.
Allow multiple tests to be specified on the command-line, and recognize
syntax errors. (Previously, as long as the arguments ended in a test
name, invalid arguments that didn't start "--" would be silently ignored.
The new test for "-" is strictly unnecessary -- the other changes are
sufficient -- but the explicit early test allows for clearer error
reporting.)
Ben Cheng [Tue, 29 Sep 2009 23:12:51 +0000 (16:12 -0700)]
Fixed the trace builder to correctly handle excpetion throwing instruction.
Added a new unit test 081-hot-exceptions to target this problem.
Lorenzo Colitti [Fri, 18 Sep 2009 22:25:06 +0000 (15:25 -0700)]
Manual merge of change I3665f82b into master.
Joshua Bloch [Mon, 21 Sep 2009 21:50:34 +0000 (14:50 -0700)]
Replace existing ArrayList implementation with faster, simpler one.
Android (Google) Code Review [Mon, 28 Sep 2009 20:59:43 +0000 (16:59 -0400)]
Merge change I5e88f105
* changes:
Add copyright statement to dexcheck.
Andy McFadden [Mon, 28 Sep 2009 19:36:06 +0000 (12:36 -0700)]
Add copyright statement to dexcheck.
Because even humble shell scripts deserve legal protection.
Jesse Wilson [Mon, 28 Sep 2009 17:00:28 +0000 (10:00 -0700)]
am
f591c78e: (-s ours) am
94bf2b21: Merge change 27156 into eclair
Merge commit '
f591c78e3117dfbd727411386175bf1c1aef615b'
* commit '
f591c78e3117dfbd727411386175bf1c1aef615b':
DO NOT MERGE: Cleaning up PipedInputStream
Jesse Wilson [Mon, 28 Sep 2009 17:00:24 +0000 (10:00 -0700)]
am
2ff7a674: am
979baaea: Deprecate many of the accidentally-published APIs in dalvik.system.
Merge commit '
2ff7a6741726c7f43a3cea6d30bf7c387f913e78'
* commit '
2ff7a6741726c7f43a3cea6d30bf7c387f913e78':
Deprecate many of the accidentally-published APIs in dalvik.system.
Ben Cheng [Mon, 28 Sep 2009 00:08:35 +0000 (17:08 -0700)]
Fixed OOM exception handling in JIT'ed code and added a new unit test.
Ben Cheng [Sun, 27 Sep 2009 18:07:01 +0000 (11:07 -0700)]
Registers allocated for 64-bit values should be contiguous.
Found in "Karl's Mortgage Calculator" from the market.
Jesse Wilson [Sat, 26 Sep 2009 18:21:10 +0000 (11:21 -0700)]
am
94bf2b21: Merge change 27156 into eclair
Merge commit '
94bf2b217df69e943843b51b0ea0bb72743cc6b3' into eclair-plus-aosp
* commit '
94bf2b217df69e943843b51b0ea0bb72743cc6b3':
DO NOT MERGE: Cleaning up PipedInputStream
Android (Google) Code Review [Sat, 26 Sep 2009 18:13:21 +0000 (14:13 -0400)]
Merge change 27156 into eclair
* changes:
DO NOT MERGE: Cleaning up PipedInputStream
Jesse Wilson [Sat, 26 Sep 2009 17:51:41 +0000 (10:51 -0700)]
am
979baaea: Deprecate many of the accidentally-published APIs in dalvik.system.
Merge commit '
979baaeae3122b0c7ad5b24e7842472127b8a967' into eclair-plus-aosp
* commit '
979baaeae3122b0c7ad5b24e7842472127b8a967':
Deprecate many of the accidentally-published APIs in dalvik.system.
Jesse Wilson [Wed, 23 Sep 2009 06:42:13 +0000 (23:42 -0700)]
Deprecate many of the accidentally-published APIs in dalvik.system.
See bug
2021674 for discussion. I searched Google Code Search to
sample which of these APIs are being used. None of these APIs
were used by applications, so I'm quite confident that removing
them will not break applications or upset developers.
These APIs were neither formerly documented, nor intended for use
by application developers. I am deprecating them now to discourage
their use going forward. We should remove them in a future release.
Jesse Wilson [Fri, 25 Sep 2009 23:03:19 +0000 (16:03 -0700)]
DO NOT MERGE: Cleaning up PipedInputStream
Andy McFadden [Fri, 25 Sep 2009 18:12:50 +0000 (11:12 -0700)]
am
7a37c30a: am
bb710e32: Remove ((noreturn)) from dvmAbort().
Merge commit '
7a37c30a85c58a8c51ae3f9551132a1bf405e4f6'
* commit '
7a37c30a85c58a8c51ae3f9551132a1bf405e4f6':
Remove ((noreturn)) from dvmAbort().
Android (Google) Code Review [Fri, 25 Sep 2009 18:06:28 +0000 (14:06 -0400)]
Merge change 26716
* changes:
Fix Node.getNextSibling bounds checking.
Elliott Hughes [Thu, 24 Sep 2009 00:01:24 +0000 (17:01 -0700)]
Fix Node.getNextSibling bounds checking.
Obvious copy & paste error in InnerNodeImpl compared to LeafNodeImpl, plus
new test.
I've also fixed a typo that annoys me whenever I look at the XML test results,
and removed a KnownFailure for a test that passes (and has been passing for
some time).
Bug: 779
Ben Cheng [Tue, 22 Sep 2009 18:23:36 +0000 (11:23 -0700)]
Implemented a new scheduler and FP register allocator.
Improved performance by 50% over existing JIT for some FP benchmarks.
Lorenzo Colitti [Fri, 25 Sep 2009 15:44:16 +0000 (08:44 -0700)]
am
ac60268a: (-s ours) am
f1823804: Merge change 26285 into eclair
Merge commit '
ac60268af417d3a9a948309798d92196a958bc75'
* commit '
ac60268af417d3a9a948309798d92196a958bc75':
Use native code to convert strings to IP addresses.
Android (Google) Code Review [Fri, 25 Sep 2009 00:32:55 +0000 (20:32 -0400)]
Merge change 26934
* changes:
Fix 32-bit int shifted >= 32 bits in SSLInputStream.
Elliott Hughes [Thu, 24 Sep 2009 22:30:09 +0000 (15:30 -0700)]
Fix 32-bit int shifted >= 32 bits in SSLInputStream.
This code isn't actually called by us, but it's public API.
Bug:
2099901
Andy McFadden [Thu, 24 Sep 2009 22:25:39 +0000 (15:25 -0700)]
am
bb710e32: Remove ((noreturn)) from dvmAbort().
Merge commit '
bb710e3294c57587f327c5e365353af81aa2cb5f' into eclair-plus-aosp
* commit '
bb710e3294c57587f327c5e365353af81aa2cb5f':
Remove ((noreturn)) from dvmAbort().
Android (Google) Code Review [Thu, 24 Sep 2009 21:59:46 +0000 (17:59 -0400)]
Merge change 26920
* changes:
Fix gcc complaint.
Andy McFadden [Thu, 24 Sep 2009 21:52:54 +0000 (14:52 -0700)]
Fix gcc complaint.
Andy McFadden [Thu, 24 Sep 2009 21:44:59 +0000 (14:44 -0700)]
Remove ((noreturn)) from dvmAbort().
Functions that could call dvmAbort() from more than one place were
merging the calls together, which is great until you need to decode a
native stack trace.
For
2144313.
Android (Google) Code Review [Wed, 23 Sep 2009 20:49:51 +0000 (16:49 -0400)]
Merge change 26371
* changes:
Fix right shift by constant 0 in Jit. Bug #
2135879
Andy McFadden [Wed, 23 Sep 2009 18:36:29 +0000 (11:36 -0700)]
Andy McFadden [Wed, 23 Sep 2009 18:36:24 +0000 (11:36 -0700)]
Android (Google) Code Review [Wed, 23 Sep 2009 17:52:55 +0000 (13:52 -0400)]
Merge change 26453
* changes:
Fix Formatter.format's handling of Formattable.
Lorenzo Colitti [Wed, 23 Sep 2009 00:49:21 +0000 (17:49 -0700)]
am
f1823804: Merge change 26285 into eclair
Merge commit '
f182380424709227a08f7d84056209be0952d06d' into eclair-plus-aosp
* commit '
f182380424709227a08f7d84056209be0952d06d':
Use native code to convert strings to IP addresses.
Android (Google) Code Review [Wed, 23 Sep 2009 00:40:32 +0000 (20:40 -0400)]
Merge change 26285 into eclair
* changes:
Use native code to convert strings to IP addresses.
Lorenzo Colitti [Fri, 18 Sep 2009 22:25:06 +0000 (15:25 -0700)]
Use native code to convert strings to IP addresses.
1. Add an ipStringToByteArray method to the OSNetworkSystem interface and
provide a native implementation for it.
2. Change InetAddress to use the new method.
3. Remove a mid-sized chunk of Inet6Util, which is now redundant.
4. Remove the KnownFailure annotations from the InetAddress, InetAddress and
Inet6Address tests that expected 1.2.3, 1.3 and 3 to be valid IPv4
addresses. These tests now pass again.
5. Removed an unused native method.
6. Added a comment to the top of the native socket implementation to the effect
that the file is significantly different from harmony.
Change-Id: I3665f82b00ebc089e9133cc6166dda5a99fa10e4
Elliott Hughes [Tue, 22 Sep 2009 21:38:18 +0000 (14:38 -0700)]
Fix Formatter.format's handling of Formattable.
This doesn't make much difference to performance, but it is
slightly faster and I think it reads better too. Proof of the
latter is the fact that the rewritten form accidentally fixed
bug 1767: the old code was storing up literal text until after
handling the next format specifier, which is wrong if the
format specifier has side effects caused by the use of
Formattable.
(I don't plan on doing any more on the performance bug for now,
though I note that %g allocates and manipulates BigDecimal
instances, which would be worth looking at when we get round to
the bug that causes it to fail a harmony test.)
Bug: 1476, 1767
Andy McFadden [Tue, 22 Sep 2009 21:48:40 +0000 (14:48 -0700)]
am
40f3271c: More doc changes.
Merge commit '
40f3271c2dd386878c9a180462c75c890913e9b4' into eclair-plus-aosp
* commit '
40f3271c2dd386878c9a180462c75c890913e9b4':
More doc changes.
Andy McFadden [Tue, 22 Sep 2009 21:48:36 +0000 (14:48 -0700)]
am
9ae00645: Merge change 26280 into eclair
Merge commit '
9ae0064588a6f922834c8998ef91f04a0d19b1cc' into eclair-plus-aosp
* commit '
9ae0064588a6f922834c8998ef91f04a0d19b1cc':
Another doc update.
Andy McFadden [Tue, 22 Sep 2009 20:55:42 +0000 (13:55 -0700)]
More doc changes.
Some content changes inspired by external developer feedback, plus some
corrections of long-standing typos.
Elliott Hughes [Tue, 22 Sep 2009 20:27:24 +0000 (13:27 -0700)]
Fix useDaylightTime for zh_TW (and other locales).
TimeZone.useDaylightTime shouldn't report whether a locale has *ever* used DST,
but whether a locale uses DST "these days". Taiwan is an example supported
locale that historically used DST but hasn't used it since 1980.
Bug: 877
Bill Buzbee [Tue, 22 Sep 2009 16:45:41 +0000 (09:45 -0700)]
Fix right shift by constant 0 in Jit. Bug #
2135879
Joshua Bloch [Tue, 22 Sep 2009 14:40:06 +0000 (07:40 -0700)]
Android (Google) Code Review [Tue, 22 Sep 2009 14:33:43 +0000 (10:33 -0400)]
Merge change 26280 into eclair
* changes:
Another doc update.
Joshua Bloch [Tue, 22 Sep 2009 14:30:10 +0000 (07:30 -0700)]
am
51ccfdb5: Merge change 26318 into eclair
Merge commit '
51ccfdb54990e2c30bc3057e8f18ee760c7eee41' into eclair-plus-aosp
* commit '
51ccfdb54990e2c30bc3057e8f18ee760c7eee41':
Fixed LinkedHashMap bug
2121546
Android (Google) Code Review [Tue, 22 Sep 2009 14:19:59 +0000 (10:19 -0400)]
Merge change 26318 into eclair
* changes:
Fixed LinkedHashMap bug
2121546 Also made minor improvements in LinkedHashMap and NegativeCache. (The "opportunities for improvement" were discovered while investigating the bug.)
Android (Google) Code Review [Tue, 22 Sep 2009 04:58:04 +0000 (00:58 -0400)]
Merge change 26288
* changes:
Cleaning up PipedInputStream.
Joshua Bloch [Mon, 21 Sep 2009 21:37:12 +0000 (14:37 -0700)]
Fixed LinkedHashMap bug
2121546
Also made minor improvements in LinkedHashMap and NegativeCache.
(The "opportunities for improvement" were discovered while investigating the bug.)
Jesse Wilson [Mon, 21 Sep 2009 23:54:54 +0000 (16:54 -0700)]
Cleaning up PipedInputStream.
In particular, fixing a problem where the reader thread fails
as soon as the writer thread exists, even if there is data left
for the reader thread to read. Similarly, the writer fails fast
even when the buffer has space remaining.
Also fixing some concurrency issues by making readers and writers
release each other more aggressively.
Bob Lee [Tue, 22 Sep 2009 00:54:50 +0000 (17:54 -0700)]
am
158135f4: am
2317d8dd: Merge change 26055 into eclair
Merge commit '
158135f49f5372f24557d9d1e0917fd746acf6f2'
* commit '
158135f49f5372f24557d9d1e0917fd746acf6f2':
Replaced an O(N) algorithm with an O(1) algorithm. This shaves off 2/3 of the server cert checking time or ~200ms on Sapphire. This is in preparation for tripling the number of certs in an upcoming change.
Bob Lee [Tue, 22 Sep 2009 00:44:14 +0000 (17:44 -0700)]
am
2317d8dd: Merge change 26055 into eclair
Merge commit '
2317d8dd084c260712ae50c42024c57825da1472' into eclair-plus-aosp
* commit '
2317d8dd084c260712ae50c42024c57825da1472':
Replaced an O(N) algorithm with an O(1) algorithm. This shaves off 2/3 of the server cert checking time or ~200ms on Sapphire. This is in preparation for tripling the number of certs in an upcoming change.