OSDN Git Service
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:11:14 +0000 (15:11 -0700)]
am
bda07e21: am
11998b33: Adapt to new location of libcore
Merge commit '
bda07e21fbc1b471fb077183b689312e0a91c02b' into dalvik-dev
* commit '
bda07e21fbc1b471fb077183b689312e0a91c02b':
Adapt to new location of libcore
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:11:12 +0000 (15:11 -0700)]
am
2b7c1146: am
a87b6301: Delete libcore, now in its own project
Merge commit '
2b7c114648c234baed89cea73d145d814677ccec' into dalvik-dev
* commit '
2b7c114648c234baed89cea73d145d814677ccec':
Delete libcore, now in its own project
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:08:24 +0000 (15:08 -0700)]
am
11998b33: Adapt to new location of libcore
Jean-Baptiste Queru [Fri, 30 Apr 2010 22:08:15 +0000 (15:08 -0700)]
am
a87b6301: Delete libcore, now in its own project
Jesse Wilson [Fri, 30 Apr 2010 20:34:21 +0000 (13:34 -0700)]
Merge "Merge xml module into luni" into dalvik-dev
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:13:34 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: Ic63de1ef810434dad7e07dcfd8452f1630ec70c5
Jean-Baptiste Queru [Fri, 30 Apr 2010 19:50:55 +0000 (12:50 -0700)]
am
0f93168f: Adapt to new location of libcore
Merge commit '
0f93168feebe941eeb5096a6dc0c7c08bfc1cda8' into dalvik-dev
* commit '
0f93168feebe941eeb5096a6dc0c7c08bfc1cda8':
Adapt to new location of libcore
Jean-Baptiste Queru [Fri, 30 Apr 2010 19:50:51 +0000 (12:50 -0700)]
am
7da2e838: (-s ours) Delete libcore, now in its own project
Merge commit '
7da2e83857e3da7c1339e0ffdcb66e9e6f07a968' into dalvik-dev
* commit '
7da2e83857e3da7c1339e0ffdcb66e9e6f07a968':
Delete libcore, now in its own project
Andy McFadden [Fri, 30 Apr 2010 19:18:28 +0000 (12:18 -0700)]
Merge "Minor tweaks." into dalvik-dev
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:13:34 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: I20885f385cfb325be18c33862b8e4f293a8a6146
Peter Hallam [Fri, 30 Apr 2010 18:10:30 +0000 (11:10 -0700)]
Merge xml module into luni
Change-Id: Icf83d5ee1f7f62de1923a68af3926d311c27ca99
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:22:43 +0000 (10:22 -0700)]
Merge "Adapt to new location of libcore" into dalvik-dev
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:22:23 +0000 (10:22 -0700)]
Merge "Delete libcore, now in its own project" into dalvik-dev
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:13:34 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: I4ad03a41718d3c30ce4117114f71b07a3d023dde
Andy McFadden [Fri, 30 Apr 2010 17:08:55 +0000 (10:08 -0700)]
Minor tweaks.
Leftovers from https://android-git.corp.google.com/g/49613 .
Change-Id: Ife57a36e93a9d7f4d953a88b79ed1d58d6d490cb
Dan Bornstein [Fri, 30 Apr 2010 17:02:09 +0000 (10:02 -0700)]
Merge "HOST_ARCH_VARIANT isn't ever defined, so just use HOST_ARCH as the variant when building the vm for the host." into dalvik-dev
Jean-Baptiste Queru [Fri, 30 Apr 2010 15:13:22 +0000 (08:13 -0700)]
Delete libcore, now in its own project
Change-Id: I0183edc0b48920361a6ea0ffc36fbc4cefb03f5d
Jean-Baptiste Queru [Fri, 30 Apr 2010 15:12:32 +0000 (08:12 -0700)]
Delete libcore, now in its own project
Change-Id: I459e5acceeafc5d60a6cb0ff0958a8080615904a
Jean-Baptiste Queru [Fri, 30 Apr 2010 15:11:17 +0000 (08:11 -0700)]
Delete libcore, now in its own project
Change-Id: I8fccab6d7c9197448a07f660d8b5cd1ee4005a58
Andy McFadden [Fri, 30 Apr 2010 14:35:20 +0000 (07:35 -0700)]
Merge "Add native method arguments to GC scan." into dalvik-dev
Dan Bornstein [Fri, 30 Apr 2010 00:52:22 +0000 (17:52 -0700)]
HOST_ARCH_VARIANT isn't ever defined, so just use HOST_ARCH as the
variant when building the vm for the host.
Change-Id: Ib998772654a8943477249226d8d708f804fc25f3
Andy McFadden [Mon, 26 Apr 2010 19:49:23 +0000 (12:49 -0700)]
Add native method arguments to GC scan.
We want to identify arguments passed to native methods (internal native
or JNI) so that we can tell the GC to leave those blocks alone. The
alternative is to add explicit "add to tracked ref list" calls to a
bunch of internal natives and to the JNI call bridge.
We walk through the shorty signature to make this a precise scan.
Since something is now looking at the method arguments, it was necessary
to actually set a value in the argument area on the stack for the "fake"
native method entry points used for the main thread and for externally-
created threads that are later attached to the VM.
(The implementation is currently #ifdefed-out, since there's nothing
for it to do yet.)
Change-Id: I2143ea541bc2fc50e81d36ad1c251b041553eaef
Ben Cheng [Thu, 29 Apr 2010 22:22:59 +0000 (15:22 -0700)]
Use unsigned comparison for stack pointers.
Bug:
2613607
Change-Id: I6a8abd69fbf9cb9f8ec9d9febf1ea42fd631fe9c
Jesse Wilson [Thu, 29 Apr 2010 22:19:25 +0000 (15:19 -0700)]
Merge "Adding public API for cookies." into dalvik-dev
Andy McFadden [Thu, 29 Apr 2010 21:13:01 +0000 (14:13 -0700)]
Rework common_periodicChecks.
The function was rewritten to optimize the common path. The control flow
now matches the C version, which tests for debugger/profiler even if the
previous test for suspension came up true.
This also adds a minor optimization on the test for debugger attachment,
allowing us to skip a load from memory if the process is simply not
debuggable. (The optimization isn't yet enabled because a similar change
must be made to the x86 asm code.)
The VM apparently hadn't been built without debugging/profiling support
for a while, so this fixes those places (necessary to be able to test
all forms of the new code).
Bug
2634642.
Change-Id: I096b58c961bb73ee0d128ba776d68dbf29bba924
Jesse Wilson [Thu, 29 Apr 2010 18:42:00 +0000 (11:42 -0700)]
Adding public API for cookies.
We still need to wire this into the HTTP connection classes.
http://b/issue?id=
1608781
Andy McFadden [Thu, 29 Apr 2010 17:50:30 +0000 (10:50 -0700)]
Merge "Dalvik Zip rewrite." into dalvik-dev
Andy McFadden [Fri, 23 Apr 2010 23:34:52 +0000 (16:34 -0700)]
Dalvik Zip rewrite.
Change the way zip archives are handled. This is necessary to deal with
very large (~1GB) APK files, for which our current approach of mapping
the entire file falls over.
We now do the classic scavenger hunt for the End Of Central Directory magic
on a buffer of data read from the file, instead of a memory-mapped section.
We use what we find to create a map that covers the Central Directory only.
For most uses in the VM this is all we really need, since we just want
to check file attributes vs. the optimized DEX to see if we're out of date.
If the caller is interested in unpacking the file contents, we have to
do an additional file read to discover the size of the Local File Header
section so we can skip past it. We also now do a file-to-file extraction
using read() calls instead of a buffer-to-file extraction on mmap()ed data.
No difference in performance (as measured by first-boot dexopt).
Since this is more of a rewrite than an update, I also took the opportunity
to change buffer size variables from "long" to "size_t", and normalized
return values to int (some were using bool, which is common in the VM but
was mixed in the zip code). Failure messages are now all LOGW with the
word "Zip" up front (didn't want to change log tag away from "dalvikvm").
Also, removed a not-quite-right check in the "map part of a file" code,
and clarified that the file offset is absolute.
For bug
2620103.
Change-Id: I745fb15abb541376f467969ffe422222676f1e5f
Jesse Wilson [Thu, 29 Apr 2010 06:32:13 +0000 (23:32 -0700)]
Merge "Fixing a few TreeMap bugs found by the latest Harmony tests." into dalvik-dev
Andy McFadden [Thu, 29 Apr 2010 05:02:06 +0000 (22:02 -0700)]
Merge "Use unsigned compare for stack overflow." into dalvik-dev
Jesse Wilson [Thu, 29 Apr 2010 01:31:41 +0000 (18:31 -0700)]
Fixing a few TreeMap bugs found by the latest Harmony tests.
Elliott Hughes [Wed, 28 Apr 2010 23:15:38 +0000 (16:15 -0700)]
Optimize rem-int/lit too.
Bryan hitting the bug in my div-int/lit optimization (that caused it to
try to rewrite rem-int/lit too) shows that I was wrong in assuming % wasn't
worth doing because it wouldn't be hot enough.
Before:
benchmark ns logarithmic runtime
RemainderIntByConstant2 44 XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
RemainderIntByConstant2048 34 XXXXXXXXXXXXXXXXXXXXXX|||||
RemainderIntByConstant8 44 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
RemainderIntByVariable2 40 XXXXXXXXXXXXXXXXXXXXXXXXXXX||
After:
benchmark ns logarithmic runtime
RemainderIntByConstant2 13 XXXXXXXXX|||||||||||
RemainderIntByConstant2048 16 XXXXXXXXXXXX||||||||||
RemainderIntByConstant8 16 XXXXXXXXXXXX||||||||||
RemainderIntByVariable2 40 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
Bug:
2614702
Change-Id: I719fc8765feececd5b73c3cb2e44dd3cf20c45ce
Andy McFadden [Wed, 28 Apr 2010 22:46:16 +0000 (15:46 -0700)]
Use unsigned compare for stack overflow.
When checking for stack overflow we're using a comparison that is treating
the pointers as signed values. If we manage to get a stack straddling
0x80000000, this will not work correctly.
Bug
2613607.
Change-Id: I5d178db86e93a3bb1e6a417e88d7cb1770d285bb
Elliott Hughes [Wed, 28 Apr 2010 20:52:02 +0000 (13:52 -0700)]
Don't accidentally convert % into /...
Fix a JIT bug I introduced the other day by not paying attention to the exact
dalvik opcode being optimized.
Change-Id: Ic0518645a5436e2903c2a34ef46d0205f23d571b
Elliott Hughes [Wed, 28 Apr 2010 20:40:04 +0000 (13:40 -0700)]
Merge "Add a regression test for code.google.com/p/android/issues/detail?id=7935." into dalvik-dev
Jesse Wilson [Wed, 28 Apr 2010 20:21:32 +0000 (13:21 -0700)]
Merge "Filling out implementations of java.util." into dalvik-dev
Jesse Wilson [Tue, 27 Apr 2010 22:56:39 +0000 (15:56 -0700)]
Filling out implementations of java.util.
The new code comes straight from Harmony. None of the below classes
were divergent from Harmony so the change was quite straightforward.
The changes have been tested against Harmony's test suite and jtreg.
I haven't added any new tests to our suite, but I don't need to.
Elliott Hughes [Wed, 28 Apr 2010 20:18:24 +0000 (13:18 -0700)]
Add a regression test for code.google.com/p/android/issues/detail?id=7935.
Bug: http://code.google.com/p/android/issues/detail?id=7935
Change-Id: I5d1b46687f0f257e24870fe34f05b6e7dceed346
Elliott Hughes [Wed, 28 Apr 2010 20:05:11 +0000 (13:05 -0700)]
Add a regression test for another DST-less locale.
Bug: http://code.google.com/p/android/issues/detail?id=8016
Change-Id: I260760ebc37251ccff766b78d22853d961a2694f
Elliott Hughes [Wed, 28 Apr 2010 19:56:39 +0000 (12:56 -0700)]
Merge "Remove almost all of the temporary allocations." into dalvik-dev
Guang Zhu [Wed, 28 Apr 2010 19:48:45 +0000 (12:48 -0700)]
am
cfb71ee5: (-s ours) no emma instrumentation on core-test
Merge commit '
cfb71ee5d72b7514d05b782c780d20cc5e6f73cb' into dalvik-dev
* commit '
cfb71ee5d72b7514d05b782c780d20cc5e6f73cb':
no emma instrumentation on core-test
Elliott Hughes [Wed, 28 Apr 2010 19:01:21 +0000 (12:01 -0700)]
Remove almost all of the temporary allocations.
The main source of garbage when running the tests is now
OutputStream.write(int)'s creation of temporary single-byte byte arrays, but
no performance-conscious caller should be using that. In sensible cases, we
now produce very little garbage.
Change-Id: I13b5c8aef9a48c6aca33b039af2b13d5613a5f05
Guang Zhu [Wed, 28 Apr 2010 18:33:48 +0000 (11:33 -0700)]
no emma instrumentation on core-test
* applying emma instrumentation causes OOM in dx
* test packages don't need emma instrumentation anyway, it's the
package under test that needs to be processed by emma
Change-Id: I8e65d3750aae716c52fb98d0b8cd41a748344516
Elliott Hughes [Wed, 28 Apr 2010 18:26:46 +0000 (11:26 -0700)]
Merge "Fix HttpURLConnection.setFixedLengthStreamingMode." into dalvik-dev
Elliott Hughes [Wed, 28 Apr 2010 01:25:33 +0000 (18:25 -0700)]
Fix HttpURLConnection.setFixedLengthStreamingMode.
Add better testing of chunked and fixed-length modes, and fix fixed-length mode
so it doesn't try to buffer all the output (which is the last thing you want
because the only point of that mode is to explicitly disable as much buffering
as possible).
Bug: http://code.google.com/p/android/issues/detail?id=3164
Change-Id: Ie0adc374b9c8093ab55211222cec0eeab0e27e96
Peter Hallam [Mon, 26 Apr 2010 19:53:37 +0000 (12:53 -0700)]
merge more modules into luni
Elliott Hughes [Tue, 27 Apr 2010 17:46:45 +0000 (10:46 -0700)]
Merge "Optimize idiv-int/lit for powers of 2." into dalvik-dev
Jesse Wilson [Tue, 27 Apr 2010 01:34:26 +0000 (18:34 -0700)]
Restore test expectations inadvertently deleted with vogar.
Elliott Hughes [Tue, 27 Apr 2010 00:40:13 +0000 (17:40 -0700)]
Optimize idiv-int/lit for powers of 2.
before:
DivideIntByConstant10 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXX|
DivideIntByConstant100 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXX|
DivideIntByConstant100_HandOptimized 34 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
DivideIntByConstant2 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXX|
DivideIntByConstant2048 22 XXXXXXXXXXXXXXXXXXX|||||||
DivideIntByConstant8 20 XXXXXXXXXXXXXXXXX||||||||
DivideIntByVariable10 21 XXXXXXXXXXXXXXXXXX|||||||
DivideIntByVariable2 21 XXXXXXXXXXXXXXXXXX|||||||
after:
benchmark ns logarithmic runtime
DivideIntByConstant10 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
DivideIntByConstant100 32 XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
DivideIntByConstant100_HandOptimized 33 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
DivideIntByConstant2 11 XXXXXXXXX|||||||||||
DivideIntByConstant2048 13 XXXXXXXXXXX|||||||||||
DivideIntByConstant8 13 XXXXXXXXXXX|||||||||||
DivideIntByVariable10 21 XXXXXXXXXXXXXXXXXXX|||||||
DivideIntByVariable2 22 XXXXXXXXXXXXXXXXXXXX||||||
Bug:
2614702
Change-Id: I9dde73d80580446a362cdcc9b82959a4b6bfb384
Elliott Hughes [Mon, 26 Apr 2010 20:51:04 +0000 (13:51 -0700)]
Merge "Fix =/== bug." into dalvik-dev
Elliott Hughes [Mon, 26 Apr 2010 20:45:16 +0000 (13:45 -0700)]
Fix =/== bug.
Change-Id: I42c1ede0289334b7837d468763fecc61fc4a8bea
Jesse Wilson [Mon, 26 Apr 2010 18:20:40 +0000 (11:20 -0700)]
Merge "More merging of nio into luni" into dalvik-dev
Jesse Wilson [Mon, 26 Apr 2010 17:31:19 +0000 (10:31 -0700)]
Removing vogar from Dalvik's git tree; the source is now on code.google.com.
http://code.google.com/p/vogar/
Raphael [Mon, 26 Apr 2010 17:22:33 +0000 (10:22 -0700)]
am
b59dd513: am
5793d439: am
3e557951: am
42452494: Fix dexdump to build in Windows SDK under Linux
Merge commit '
b59dd51399f17f60c5e2c9909331887417b0778c' into dalvik-dev
* commit '
b59dd51399f17f60c5e2c9909331887417b0778c':
Fix dexdump to build in Windows SDK under Linux
Raphael [Mon, 26 Apr 2010 17:11:46 +0000 (10:11 -0700)]
am
5793d439: am
3e557951: am
42452494: Fix dexdump to build in Windows SDK under Linux
Raphael [Sat, 24 Apr 2010 00:21:42 +0000 (17:21 -0700)]
am
3e557951: am
42452494: Fix dexdump to build in Windows SDK under Linux
Merge commit '
3e557951fa772390551d50c85ddd584e4370fb15' into kraken
* commit '
3e557951fa772390551d50c85ddd584e4370fb15':
Fix dexdump to build in Windows SDK under Linux
Raphael [Sat, 24 Apr 2010 00:14:24 +0000 (17:14 -0700)]
am
42452494: Fix dexdump to build in Windows SDK under Linux
Merge commit '
4245249472f7172de80874190559f6d2ef9c3803' into froyo-plus-aosp
* commit '
4245249472f7172de80874190559f6d2ef9c3803':
Fix dexdump to build in Windows SDK under Linux
Elliott Hughes [Fri, 23 Apr 2010 23:24:53 +0000 (16:24 -0700)]
Merge "Dead code/cruft removal in the collation code." into dalvik-dev
Elliott Hughes [Fri, 23 Apr 2010 23:15:38 +0000 (16:15 -0700)]
Dead code/cruft removal in the collation code.
I've also renamed ScopedUtfChars::data to ScopedUtfChars::c_str, by analogy
with std::string (since this method has always been more like c_str than data).
This also fixes a few leaks on error paths.
The old code used to go all the way into native code to return a constant hash
code of 1, so I've removed all that and switched to the idiomatic bogo hash
code (with the idiomatic comment).
Change-Id: I25da8c422155860b5ab348786d369c6c7598135c
Peter Hallam [Fri, 23 Apr 2010 01:14:04 +0000 (18:14 -0700)]
More merging of nio into luni
Change-Id: Ib4356b3cd57490df8ff246ea6a4bc1c269ba848b
Raphael [Tue, 13 Apr 2010 22:19:21 +0000 (15:19 -0700)]
Fix dexdump to build in Windows SDK under Linux
(Merged from master Change I0e57c81d)
Andy McFadden [Fri, 23 Apr 2010 20:17:36 +0000 (13:17 -0700)]
am
29af77bf: am
ca88104b: am
770379e1: am
6efd4463: Fix a deadlock in the breakpoint code.
Merge commit '
29af77bfa00ac560680dea99cf0893fccc257176' into dalvik-dev
* commit '
29af77bfa00ac560680dea99cf0893fccc257176':
Fix a deadlock in the breakpoint code.
Andy McFadden [Fri, 23 Apr 2010 20:08:03 +0000 (13:08 -0700)]
am
ca88104b: am
770379e1: am
6efd4463: Fix a deadlock in the breakpoint code.
Andy McFadden [Fri, 23 Apr 2010 20:00:17 +0000 (13:00 -0700)]
am
770379e1: am
6efd4463: Fix a deadlock in the breakpoint code.
Merge commit '
770379e17e694ec6e08f1edb690a5e33ab81c684' into kraken
* commit '
770379e17e694ec6e08f1edb690a5e33ab81c684':
Fix a deadlock in the breakpoint code.
Carl Shapiro [Fri, 23 Apr 2010 19:58:18 +0000 (12:58 -0700)]
Merge "Import the copying collector." into dalvik-dev
Carl Shapiro [Thu, 15 Apr 2010 23:10:00 +0000 (16:10 -0700)]
Import the copying collector.
Change-Id: I48ef17afd9e5e8453e560a96d307f4f949d4ab5e
Andy McFadden [Fri, 23 Apr 2010 19:55:39 +0000 (12:55 -0700)]
am
6efd4463: Fix a deadlock in the breakpoint code.
Merge commit '
6efd446399ba7a9bb68bf8ddb5a458072a1381b0' into froyo-plus-aosp
* commit '
6efd446399ba7a9bb68bf8ddb5a458072a1381b0':
Fix a deadlock in the breakpoint code.
Andy McFadden [Fri, 23 Apr 2010 00:08:11 +0000 (17:08 -0700)]
Fix a deadlock in the breakpoint code.
In froyo we started using "hard" breakpoints, where we replace the
existing opcodes with breakpoint instructions. This requires some
coordination to avoid confusing the verifier. The previous approach
allowed the breakpoints to be inserted, and "undid" them while the
verifier ran; this worked, but caused us to be holding a lock for
an extended period.
The new approach just avoids altering the bytecode of unverified
classes, and then "flushes" the breakpoint set out between the time
when verification completes and class initialization starts. This
removes the possibility of blocking with the lock held, and makes
everything much simpler.
For bug
2615063.
(cherry-pick from dalvik-dev)
Change-Id: I75f19b0cc71fc0babb50ab299c6c5a865e06c919
Andy McFadden [Fri, 23 Apr 2010 18:51:10 +0000 (11:51 -0700)]
Merge "Fix a deadlock in the breakpoint code." into dalvik-dev
Jesse Wilson [Fri, 23 Apr 2010 18:29:28 +0000 (11:29 -0700)]
Merge "Fixing some logging tests, see b/issue?id=
2487338" into dalvik-dev
Andy McFadden [Fri, 23 Apr 2010 00:08:11 +0000 (17:08 -0700)]
Fix a deadlock in the breakpoint code.
In froyo we started using "hard" breakpoints, where we replace the
existing opcodes with breakpoint instructions. This requires some
coordination to avoid confusing the verifier. The previous approach
allowed the breakpoints to be inserted, and "undid" them while the
verifier ran; this worked, but caused us to be holding a lock for
an extended period.
The new approach just avoids altering the bytecode of unverified
classes, and then "flushes" the breakpoint set out between the time
when verification completes and class initialization starts. This
removes the possibility of blocking with the lock held, and makes
everything much simpler.
For bug
2615063.
Change-Id: I7f43e09a755fba27b335454659b3f04e8b2179ac
Jesse Wilson [Fri, 23 Apr 2010 01:41:59 +0000 (18:41 -0700)]
Fixing some logging tests, see b/issue?id=
2487338
Jesse Wilson [Thu, 22 Apr 2010 23:25:52 +0000 (16:25 -0700)]
Remove unnecessary IPv6 and IPv4 parsing from URI.
Cleanup URI and InetAddress exception localization.
Jesse Wilson [Thu, 22 Apr 2010 22:28:47 +0000 (15:28 -0700)]
Merge "Fixing java.lang.NullPointerException at java.net.URI$Helper.isValidDomainName" into dalvik-dev
Jesse Wilson [Thu, 22 Apr 2010 21:27:58 +0000 (14:27 -0700)]
Fixing java.lang.NullPointerException at java.net.URI$Helper.isValidDomainName
See http://b/issue?id=
2604061
Elliott Hughes [Thu, 22 Apr 2010 21:01:28 +0000 (14:01 -0700)]
Merge "java.text.RuleBasedCollator fixes." into dalvik-dev
Elliott Hughes [Thu, 22 Apr 2010 20:38:42 +0000 (13:38 -0700)]
java.text.RuleBasedCollator fixes.
Add expectations for broken harmony tests, add our own equivalent (but correct)
tets, and fix the bug turned up by the correct tests: the icu4jni
RuleBasedCollator was using toString to convert a CharacterIterator to a
String, resulting in iteration over the result of Object.toString (the class
name and identity hash code) rather than the characters of interest.
Also shut javac up about non-ASCII characters in Locale.java.
Bug:
2608742
Bug:
2608750
Change-Id: I2171789058c8116eacd7e5815bd483f0bc07c69b
The Android Open Source Project [Thu, 22 Apr 2010 20:49:06 +0000 (13:49 -0700)]
am
ed4035bc: am
d2203aa0: am
1beb43af: merge from open-source master
Merge commit '
ed4035bca3233c7a40c4d5679c3f7dfea9516c7e' into dalvik-dev
* commit '
ed4035bca3233c7a40c4d5679c3f7dfea9516c7e':
Improve the implementation of countOnes function to use only 12 operations.
The Android Open Source Project [Thu, 22 Apr 2010 20:39:14 +0000 (13:39 -0700)]
am
d2203aa0: am
1beb43af: merge from open-source master
The Android Open Source Project [Thu, 22 Apr 2010 20:25:29 +0000 (13:25 -0700)]
am
1beb43af: merge from open-source master
Merge commit '
1beb43af9350d47016c0e3ec55c1b2d4230cae7e' into kraken
* commit '
1beb43af9350d47016c0e3ec55c1b2d4230cae7e':
Improve the implementation of countOnes function to use only 12 operations.
The Android Open Source Project [Thu, 22 Apr 2010 19:44:36 +0000 (12:44 -0700)]
merge from open-source master
Change-Id: Ia08d4f55f5cdced2878777e0812c8cbbf26bb0d6
Elliott Hughes [Thu, 22 Apr 2010 00:34:53 +0000 (17:34 -0700)]
Update to the latest upstream collator tests.
I've pulled out the not-obviously-insane stuff we added, though I don't
know how useful it is. This change is mainly about reverting our broken
changes to these tests.
Bug:
2608750
Bug:
2608742
Change-Id: Ia4d0a7b12bfc5dfc3fad4b72254918acf74b418d
Jesse Wilson [Wed, 21 Apr 2010 23:33:10 +0000 (16:33 -0700)]
Merge "Suppress all failures in setSecurityManager() with vogar." into dalvik-dev
Jesse Wilson [Wed, 21 Apr 2010 21:36:15 +0000 (14:36 -0700)]
Suppress all failures in setSecurityManager() with vogar.
Elliott Hughes [Wed, 21 Apr 2010 20:48:48 +0000 (13:48 -0700)]
am
3825d34f: am
d4b6f6aa: am
1dd42bb9: Fix NetworkInterface on sholes/ppp.
Merge commit '
3825d34f9cd5057504ced60962638ffb54f14e38' into dalvik-dev
* commit '
3825d34f9cd5057504ced60962638ffb54f14e38':
Fix NetworkInterface on sholes/ppp.
Elliott Hughes [Wed, 21 Apr 2010 20:39:13 +0000 (13:39 -0700)]
am
d4b6f6aa: am
1dd42bb9: Fix NetworkInterface on sholes/ppp.
Elliott Hughes [Wed, 21 Apr 2010 20:29:59 +0000 (13:29 -0700)]
am
1dd42bb9: Fix NetworkInterface on sholes/ppp.
Merge commit '
1dd42bb9da388c55191449b848f9d82dc4673229' into kraken
* commit '
1dd42bb9da388c55191449b848f9d82dc4673229':
Fix NetworkInterface on sholes/ppp.
Elliott Hughes [Wed, 21 Apr 2010 19:53:02 +0000 (12:53 -0700)]
Merge "Fix Locale.getDisplayName for unlocalizable languages/countries/variants." into dalvik-dev
Elliott Hughes [Wed, 21 Apr 2010 19:48:25 +0000 (12:48 -0700)]
Fix NetworkInterface on sholes/ppp.
We need to use IFA_LOCAL to get the interface addresses; IFA_ADDRESS is the
remote address (which is usually the same as IFA_LOCAL, but not in the ppp
case).
Tested on sholes, where it fixes the test used in the bug; also tested on
passion, where it doesn't break the already-working test.
Bug:
2575983
Change-Id: Ib334a002dc099daeeb05cbc341fe233d4d11d2f7
Andy McFadden [Wed, 21 Apr 2010 17:33:56 +0000 (10:33 -0700)]
Merge "Add some .odex info to dexdump output." into dalvik-dev
Elliott Hughes [Wed, 21 Apr 2010 17:23:08 +0000 (10:23 -0700)]
Fix Locale.getDisplayName for unlocalizable languages/countries/variants.
This does not address the interpretation of script identifiers, but does bring us
in line with the RI's behavior. That's why the test doesn't use the example from
the bug.
Bug:
2611311
Change-Id: I54af89aaf418cd520dc6ebdb1e27dc1ac373f70f
Jesse Wilson [Wed, 21 Apr 2010 04:34:28 +0000 (21:34 -0700)]
Rewrite the HTTP connection pool used by HttpURLConnection.
This started off as incremental changes, but it ended up going
far enough that it earned the "rewrite" badge.
System.getProperty() is not called for every HTTP connection.
This is slightly controversial, but the old code had to bend
over backwards to support dynamic pool changes, and it didn't
even support the case when the pool shrank but not to 0.
The new code doesn't do I/O within static synchronized blocks.
This should reduce contention described here: http://b/issue?id=
2606547
Also: simpify implementation, prettier names, more focused doc.
Carl Shapiro [Tue, 20 Apr 2010 23:38:01 +0000 (16:38 -0700)]
am
0691c470: am
6f7ec8e6: am
28f4d74b: Merge "Remove dangerous logging code from unlockMonitor. It is unsafe to dereference a potentially corrupt lock word to retrieve additional information about the lock state. This code was added to debug a transient error and ha
Merge commit '
0691c4701cf8cd32db1bc034dc5f544a807aeb3d' into dalvik-dev
* commit '
0691c4701cf8cd32db1bc034dc5f544a807aeb3d':
Remove dangerous logging code from unlockMonitor. It is unsafe to
Guang Zhu [Tue, 20 Apr 2010 23:37:58 +0000 (16:37 -0700)]
am
7e3d5fcd: Merge "include emma into core library on conditional flag"
Merge commit '
7e3d5fcddef15bf2dff71c2fe5ee794536819973' into dalvik-dev
* commit '
7e3d5fcddef15bf2dff71c2fe5ee794536819973':
include emma into core library on conditional flag
Huahui Wu [Tue, 20 Apr 2010 23:37:52 +0000 (16:37 -0700)]
am
91be9e67: am
9cfe27bd: am
8068ea8d: Update the ssl test so the client reads something from the server. This is needed when cut-through feature is needed as in b/
2586347. Dr. No approved in b/issue?id=
2511073 .
Merge commit '
91be9e671d7db5444aa8fa5f0101867ba8a73075' into dalvik-dev
* commit '
91be9e671d7db5444aa8fa5f0101867ba8a73075':
Update the ssl test so the client reads something from the server.
Jesse Wilson [Mon, 19 Apr 2010 22:01:12 +0000 (15:01 -0700)]
Fixing TimeZone.setDefault() documentation.
Set expectations for date formatting to tolerate "GMT-07" in the
output. The alternative is to emit an ambigous date string.
Applications that want pretty date formatting should use the
proper facilities: SimpleDateFormat, etc.
This problem was detected by org.apache.harmony.luni.tests.java.util.DateTest.test_toString
Carl Shapiro [Tue, 20 Apr 2010 23:06:27 +0000 (16:06 -0700)]
am
6f7ec8e6: am
28f4d74b: Merge "Remove dangerous logging code from unlockMonitor. It is unsafe to dereference a potentially corrupt lock word to retrieve additional information about the lock state. This code was added to debug a transient error and has since been
Carl Shapiro [Tue, 20 Apr 2010 22:58:23 +0000 (15:58 -0700)]
am
28f4d74b: Merge "Remove dangerous logging code from unlockMonitor. It is unsafe to dereference a potentially corrupt lock word to retrieve additional information about the lock state. This code was added to debug a transient error and has since been removed from
Merge commit '
28f4d74b59e9e40278c4f1fe797d8c75f51b5326' into kraken
* commit '
28f4d74b59e9e40278c4f1fe797d8c75f51b5326':
Remove dangerous logging code from unlockMonitor. It is unsafe to
Carl Shapiro [Tue, 20 Apr 2010 22:51:47 +0000 (15:51 -0700)]
Merge "Remove dangerous logging code from unlockMonitor. It is unsafe to dereference a potentially corrupt lock word to retrieve additional information about the lock state. This code was added to debug a transient error and has since been removed from other branches." into froyo
Carl Shapiro [Tue, 20 Apr 2010 22:48:46 +0000 (15:48 -0700)]
resolved conflicts for merge of
ee25fc06 to dalvik-dev
Change-Id: Ib8c3c62b3b791a8087d7e6298006a6221726cf78