OSDN Git Service
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).
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.
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.
Android (Google) Code Review [Tue, 22 Sep 2009 00:36:39 +0000 (20:36 -0400)]
Merge change 26055 into eclair
* changes:
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.
Andy McFadden [Mon, 21 Sep 2009 23:28:39 +0000 (16:28 -0700)]
Another doc update.
Emphasized the need for global ref with FindClass. Stated that JNI_OnLoad
is optional. Added note about FindClass and class loaders.
Android (Google) Code Review [Mon, 21 Sep 2009 23:03:28 +0000 (19:03 -0400)]
Merge change 26247
* changes:
Consistently use Formatter's cached NumberFormat.
David 'Digit' Turner [Mon, 21 Sep 2009 22:15:27 +0000 (15:15 -0700)]
am
baa78bce: am
bdfa9937: Merge change 25979 into eclair
Merge commit '
baa78bce6683560b4f9dca3b71e33d90d2d0cf29'
* commit '
baa78bce6683560b4f9dca3b71e33d90d2d0cf29':
Allow dalvik pre-optimization to run in ARMv7 emulator.
David 'Digit' Turner [Mon, 21 Sep 2009 22:04:49 +0000 (15:04 -0700)]
am
bdfa9937: Merge change 25979 into eclair
Merge commit '
bdfa9937a8fc8230ca109774ccc1eafaa20ba1a7' into eclair-plus-aosp
* commit '
bdfa9937a8fc8230ca109774ccc1eafaa20ba1a7':
Allow dalvik pre-optimization to run in ARMv7 emulator.
Android (Google) Code Review [Mon, 21 Sep 2009 21:55:56 +0000 (17:55 -0400)]
Merge change 25979 into eclair
* changes:
Allow dalvik pre-optimization to run in ARMv7 emulator.
David 'Digit' Turner [Sun, 20 Sep 2009 18:58:16 +0000 (11:58 -0700)]
Allow dalvik pre-optimization to run in ARMv7 emulator.
This sad hack is used to allow the Dex preopt pass to run properly
in ARMv7 emulation mode. Without it, the function dvmComputeWidths()
aborts the VM in ways that are hard to properly understand.
This issue has been discussed extensively with fadden, which provided
the patch. It seems that adding both log lines fixes it, but only using
one will not. I'm suspecting an emulation bug, or even worse, a C compiler
bug that would generate invalid machine code.
NOTE: The dex pre-optimization pass of user builds requires to run
the DexOpt in the emulator for all -user builds. While this patch
might not fix the underlying issue, it allows us to generate these
images correctly (along with a few other system hacks).
Elliott Hughes [Mon, 21 Sep 2009 21:08:38 +0000 (14:08 -0700)]
Consistently use Formatter's cached NumberFormat.
%f is a lot more expensive than it should be because we're not using the cached
NumberFormat (as we are for %d). Running the microbenchmark I added to the
bug (times in ms, on a Cortex A8):
old new
new Formatter %f 1732 811
String.format %d 635 651
String.format %f 1752 900
reuse Formatter %f 1521 188
Double.toString + 149 148
Double.toString append 33 33
StringBuilder.append 143 139
Bug: 1476
Android (Google) Code Review [Mon, 21 Sep 2009 16:27:42 +0000 (12:27 -0400)]
Merge change 25926
* changes:
Manual merge of eclair change I26548922 into master.
Bob Lee [Sun, 20 Sep 2009 22:56:35 +0000 (15:56 -0700)]
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.
Jesse Wilson [Sun, 20 Sep 2009 19:58:33 +0000 (12:58 -0700)]
Adding checks for already-closed ZIP files.
See bug
1635955.
Lorenzo Colitti [Sat, 19 Sep 2009 18:06:31 +0000 (11:06 -0700)]
Manual merge of eclair change I26548922 into
Andy McFadden [Sat, 19 Sep 2009 01:16:46 +0000 (18:16 -0700)]
am
0f117a58: am
c7659ec1: Various minor changes to Dalvik documentation.
Merge commit '
0f117a580d22e6f68a6fb821e6cbc8c67389e8de'
* commit '
0f117a580d22e6f68a6fb821e6cbc8c67389e8de':
Various minor changes to Dalvik documentation.
Lorenzo Colitti [Sat, 19 Sep 2009 01:04:16 +0000 (18:04 -0700)]
Merge commit '
fc8ccda5' into manualmerge
Andy McFadden [Fri, 18 Sep 2009 23:25:47 +0000 (16:25 -0700)]
am
c7659ec1: Various minor changes to Dalvik documentation.
Merge commit '
c7659ec11fb9993f8c1f89e6c72f569da5504052' into eclair-plus-aosp
* commit '
c7659ec11fb9993f8c1f89e6c72f569da5504052':
Various minor changes to Dalvik documentation.
Andy McFadden [Fri, 18 Sep 2009 23:14:41 +0000 (16:14 -0700)]
Various minor changes to Dalvik documentation.
Some updates for Eclair, some minor fixes.
Lorenzo Colitti [Fri, 18 Sep 2009 21:27:35 +0000 (14:27 -0700)]
am
5415f434: Merge change 25603 into eclair
Merge commit '
5415f4344b4c9b9186e291909d5f369b6435011e' into eclair-plus-aosp
* commit '
5415f4344b4c9b9186e291909d5f369b6435011e':
Use native code to convert IP addresses to strings.
Android (Google) Code Review [Fri, 18 Sep 2009 21:19:01 +0000 (17:19 -0400)]
Merge change 25603 into eclair
* changes:
Use native code to convert IP addresses to strings.
Lorenzo Colitti [Thu, 17 Sep 2009 22:01:47 +0000 (15:01 -0700)]
Use native code to convert IP addresses to strings.
- Add a byteArrayToIpString method to the INetworkSystem interface and implement
it in native code
- Fix the native code so it does better error reporting
- Change InetAddress's getHostAddress, getHostName and getCanonicalHostName
methods to use it and remove the IPv4-only Java implementations
- Remove Inet6Util.createIPAddrStringFromByteArray
- Fix InetAddress so getByAddress(null) throws UnknownHostException instead of
NullPointerException for compatibility with the RI.
Change-Id: I26548922e9eed63b295173456183c4ab3ce20718
Jesse Wilson [Fri, 18 Sep 2009 19:32:57 +0000 (12:32 -0700)]
am
52176e28: am
8aad9a92: Merge change 24897 into eclair
Merge commit '
52176e2898f94f874d3f1ca62d70d6878ef62532'
* commit '
52176e2898f94f874d3f1ca62d70d6878ef62532':
First cut at a tool to perform automated syncs from Harmony to Dalvik.
Jesse Wilson [Fri, 18 Sep 2009 19:23:24 +0000 (12:23 -0700)]
am
8aad9a92: Merge change 24897 into eclair
Merge commit '
8aad9a92ff05b12d3ab930de29a47f29ab6ea9b0' into eclair-plus-aosp
* commit '
8aad9a92ff05b12d3ab930de29a47f29ab6ea9b0':
First cut at a tool to perform automated syncs from Harmony to Dalvik.
Jesse Wilson [Fri, 18 Sep 2009 19:18:25 +0000 (12:18 -0700)]
am
40e5e99e: am
7f331f3e: Fixing available() and close() for archive streams.
Merge commit '
40e5e99e5d19b9f2ff4cd26deeb141bc3d7f9df9'
* commit '
40e5e99e5d19b9f2ff4cd26deeb141bc3d7f9df9':
Fixing available() and close() for archive streams.
Wei Huang [Fri, 18 Sep 2009 19:18:21 +0000 (12:18 -0700)]
am
518c44cb: am
eea407c0: Merge change 25361 into eclair
Merge commit '
518c44cb3e250e7b8dc91ad4b3c03a970a84793b'
* commit '
518c44cb3e250e7b8dc91ad4b3c03a970a84793b':
modify gclog to take a procFilter argument, as well as the debug argument
Jesse Wilson [Fri, 18 Sep 2009 19:18:16 +0000 (12:18 -0700)]
am
17e591c5: am
df60455b: Merge change 25126 into eclair
Merge commit '
17e591c55554fc291fb8bd8a00bfdff0d6e46d11'
* commit '
17e591c55554fc291fb8bd8a00bfdff0d6e46d11':
Update archive to the r802921 from Harmony.
Android (Google) Code Review [Fri, 18 Sep 2009 19:16:23 +0000 (15:16 -0400)]
Merge change 24897 into eclair
* changes:
First cut at a tool to perform automated syncs from Harmony to Dalvik.
Jesse Wilson [Fri, 18 Sep 2009 19:07:52 +0000 (12:07 -0700)]
am
7f331f3e: Fixing available() and close() for archive streams.
Merge commit '
7f331f3efb8c9c9879bf6b5154eaf2fdc849ab9b' into eclair-plus-aosp
* commit '
7f331f3efb8c9c9879bf6b5154eaf2fdc849ab9b':
Fixing available() and close() for archive streams.
Elliott Hughes [Fri, 18 Sep 2009 01:32:07 +0000 (18:32 -0700)]
Fix heap corruption in nio select(2) code.
The active ingredient in this change is that we now test that the fd isn't -1,
used to represent an invalid fd. There's a race condition where a socket can be
closed between SelectorImpl.prepareChannels and the native code. This caused us
to write to the -1th element of a heap-allocated structure, leading to SIGSEGV.
I've also removed the check for an empty fd_set. It was broken before and will
never have fired, but I don't think it makes sense to fix it, given this race
condition.
The race can't be fixed because the implementation is documented to close the
socket channel and *then* cancel the selection key.
This patch also removes various dead functions and tidies up timeval usage.
Bug:
2093094
Jesse Wilson [Thu, 17 Sep 2009 01:21:02 +0000 (18:21 -0700)]
Fixing available() and close() for archive streams.
This builds on work originally submitted to Harmony:
http://issues.apache.org/jira/browse/HARMONY-6210
The approach is to change available() to eagerly set eof to true,
rather than waiting for a read to fail.
Android (Google) Code Review [Thu, 17 Sep 2009 19:39:31 +0000 (15:39 -0400)]
Merge change 25532
* changes:
Don't throw OutOfMemoryError if it's already been thrown.
Elliott Hughes [Thu, 17 Sep 2009 18:33:21 +0000 (11:33 -0700)]
Don't throw OutOfMemoryError if it's already been thrown.
If GetPrimitiveArrayCritical fails, it throws a suitable exception for us.
Also remove dead code.
Lorenzo Colitti [Thu, 17 Sep 2009 16:56:08 +0000 (09:56 -0700)]
am
120051b4: am
b257c944: Report the cause of name lookup failures to Java land. The Java code already uses the exception thrown by getallbyname() as a chained exception.
Merge commit '
120051b4744da2888756d901f9351ebd8e5ae467'
* commit '
120051b4744da2888756d901f9351ebd8e5ae467':
Report the cause of name lookup failures to Java land. The Java code already
Lorenzo Colitti [Thu, 17 Sep 2009 16:48:04 +0000 (09:48 -0700)]
am
a28e7d1a: am
1cf3dbce: Merge change 25160 into eclair
Merge commit '
a28e7d1a32d3883b5b279f5ddc8473e6bcbf6760'
* commit '
a28e7d1a32d3883b5b279f5ddc8473e6bcbf6760':
Make getHostByAddr and getHostByName return the proper object type.
Elliott Hughes [Thu, 17 Sep 2009 16:48:00 +0000 (09:48 -0700)]
am
d9f8adbf: am
cb12fde6: Make Resources preloadable again.
Merge commit '
d9f8adbfa912c24fb29d2a7e2ce7421a3f96ef82'
* commit '
d9f8adbfa912c24fb29d2a7e2ce7421a3f96ef82':
Make Resources$DefaultTimeZones preloadable again.
Wei Huang [Thu, 17 Sep 2009 15:42:05 +0000 (08:42 -0700)]
am
eea407c0: Merge change 25361 into eclair
Merge commit '
eea407c0e9b0a92aa80891e94125a82fac6aa514' into eclair-plus-aosp
* commit '
eea407c0e9b0a92aa80891e94125a82fac6aa514':
modify gclog to take a procFilter argument, as well as the debug argument
Jesse Wilson [Thu, 17 Sep 2009 15:39:06 +0000 (08:39 -0700)]
am
df60455b: Merge change 25126 into eclair
Merge commit '
df60455be5d9d3069a07f293b4021dd184cddc2a' into eclair-plus-aosp
* commit '
df60455be5d9d3069a07f293b4021dd184cddc2a':
Update archive to the r802921 from Harmony.
Urs Grob [Thu, 17 Sep 2009 12:27:58 +0000 (05:27 -0700)]
am
880e713e: am
e937b1b2: Merge change 24110 into eclair
Merge commit '
880e713e4811ab933571e722f5d84354baf42bae'
* commit '
880e713e4811ab933571e722f5d84354baf42bae':
JarFile was not able to verify signed files with size 0.
Jean-Baptiste Queru [Thu, 17 Sep 2009 12:26:40 +0000 (05:26 -0700)]
am
92f4f58d: merge from open-source master
Merge commit '
92f4f58df944fd10c77e3d39d200c38c1491a941'
* commit '
92f4f58df944fd10c77e3d39d200c38c1491a941':
Typo fix in javadoc
Cosmetic change: cst -> type in javadoc @param
San Mehat [Thu, 17 Sep 2009 01:19:52 +0000 (18:19 -0700)]
am
49f91878: am
da03242f: Merge change 24840 into eclair
Merge commit '
49f9187825d898e1b696449a0162fa8a616e0ba0'
* commit '
49f9187825d898e1b696449a0162fa8a616e0ba0':
dalvik: Switch to common cutils sched_policy api
Jesse Wilson [Thu, 17 Sep 2009 01:18:04 +0000 (18:18 -0700)]
am
3c9692c5: am
2d34a33a: Merge change 23348 into eclair
Merge commit '
3c9692c5fa8b5232ceeafe0a3067c8bdbbf2f77a'
* commit '
3c9692c5fa8b5232ceeafe0a3067c8bdbbf2f77a':
Update crypto package to Harmony r802921. Only Javadoc changes.
Jesse Wilson [Thu, 17 Sep 2009 01:01:52 +0000 (18:01 -0700)]
am
cc4c69bc: am
023a932a: Merge change 24788 into eclair
Merge commit '
cc4c69bc91a8813e654095acf13e80a4d478eb24'
* commit '
cc4c69bc91a8813e654095acf13e80a4d478eb24':
Fixing the delimiter for the HTTP "Accept" header to be well-formed.
Android (Google) Code Review [Wed, 16 Sep 2009 23:11:41 +0000 (19:11 -0400)]
Merge change 25361 into eclair
* changes:
modify gclog to take a procFilter argument, as well as the debug argument
Wei Huang [Wed, 16 Sep 2009 17:11:15 +0000 (10:11 -0700)]
modify gclog to take a procFilter argument, as well as the debug argument
Change-Id: Id897031b76f41600b7665ae27521167c70092247
Android (Google) Code Review [Wed, 16 Sep 2009 21:42:01 +0000 (17:42 -0400)]
Merge change 25126 into eclair
* changes:
Update archive to the r802921 from Harmony.
Jesse Wilson [Tue, 15 Sep 2009 21:30:29 +0000 (14:30 -0700)]
Update archive to the r802921 from Harmony.
This overdue update includes fixes for some Eclair bugs that I
originally submitted to Harmony:
1876785,
1635982,
1635998
Lorenzo Colitti [Wed, 16 Sep 2009 17:41:38 +0000 (10:41 -0700)]
am
b257c944: Report the cause of name lookup failures to Java land. The Java code already uses the exception thrown by getallbyname() as a chained exception.
Merge commit '
b257c944e15c5be46a69143603426c7ce137e6a3' into eclair-plus-aosp
* commit '
b257c944e15c5be46a69143603426c7ce137e6a3':
Report the cause of name lookup failures to Java land. The Java code already
Bob Lee [Wed, 16 Sep 2009 17:23:01 +0000 (10:23 -0700)]
resolved conflicts for merge of
3eae287e to master
Android (Google) Code Review [Wed, 16 Sep 2009 14:22:29 +0000 (10:22 -0400)]
Merge change 25222
* changes:
Speling.