OSDN Git Service
Carl Shapiro [Sun, 4 Apr 2010 08:56:48 +0000 (01:56 -0700)]
Unlock the monitor mutex before destroying it. This resolves an issue
with simulator builds where, unlike bionic, libc checks whether a
mutex is in the unlocked state before a destroy and returns EBUSY if
the check fails. Until similar checks are added to bionic we now do a
trylock, unlock sequence in the assert statements so as not to confuse
the simulator build.
Change-Id: Iafa3c52edddb17b9a8a2c648c5fd3a58d5d77988
Carl Shapiro [Mon, 5 Apr 2010 23:45:34 +0000 (16:45 -0700)]
Merge "Fix two issues with the partial gc code." into dalvik-dev
Jesse Wilson [Mon, 5 Apr 2010 22:48:13 +0000 (15:48 -0700)]
Merge "Fix vogar host mode." into dalvik-dev
Jesse Wilson [Mon, 5 Apr 2010 22:25:47 +0000 (15:25 -0700)]
Fix vogar host mode.
Also addressing bdc's comments from change Ibc7cbc81, most
notably an import-ordering issues that impact many files.
Brian Carlstrom [Mon, 5 Apr 2010 22:13:39 +0000 (15:13 -0700)]
Merge "Remove unnecessary final local variables and arguments from javax.net.ssl tests" into dalvik-dev
Brian Carlstrom [Mon, 5 Apr 2010 18:50:10 +0000 (11:50 -0700)]
Remove unnecessary final local variables and arguments from javax.net.ssl tests
Change-Id: Ie4cbad9335e37f785edab9a76c42c229a1d40f57
Jesse Wilson [Mon, 5 Apr 2010 18:21:51 +0000 (11:21 -0700)]
Merge "Removing APIs from dalvik.system that shouldn't have been published." into dalvik-dev
Andy McFadden [Mon, 5 Apr 2010 17:53:07 +0000 (10:53 -0700)]
am
14af5a09: am
54df4ecc: Added a note about android:vmSafeMode.
Merge commit '
14af5a09123df1aa766fb1ab286601fc592e4770' into dalvik-dev
* commit '
14af5a09123df1aa766fb1ab286601fc592e4770':
Added a note about android:vmSafeMode.
Andy McFadden [Mon, 5 Apr 2010 17:45:19 +0000 (10:45 -0700)]
am
54df4ecc: Added a note about android:vmSafeMode.
Andy McFadden [Mon, 5 Apr 2010 17:07:30 +0000 (10:07 -0700)]
Added a note about android:vmSafeMode.
Seems like a good thing to note here, along with the system properties that
accomplish the same thing system-wide.
(This is a minor documentation change only.)
Change-Id: Ib9adbd612d662fd2da3a02f49e730040fba8a7f3
Carl Shapiro [Sun, 4 Apr 2010 08:17:33 +0000 (01:17 -0700)]
Fix two issues with the partial gc code.
* Eliminate a fence error in bitmap aliasing. The heap structure
uses asymetric bounds but the bitmap structure uses symmetric bounds.
Bias accordingly.
* Explicitly covert the immune limit to a uintptr_t to muffle a compiler
warning.
Change-Id: I05e74ab57035ee06eb6d88e773b1d680531a7e2f
Elliott Hughes [Sat, 3 Apr 2010 19:27:56 +0000 (12:27 -0700)]
Merge "More Charset/ICU cleanup." into dalvik-dev
Brian Carlstrom [Sat, 3 Apr 2010 15:13:40 +0000 (08:13 -0700)]
Merge "New "from scratch" Junit tests for javax.net.ssl" into dalvik-dev
Brian Carlstrom [Fri, 2 Apr 2010 21:13:53 +0000 (14:13 -0700)]
New "from scratch" Junit tests for javax.net.ssl
These new tests focusi on areas where I am making OpenSSL
implementation chages, where I found differences from the RI when
working on that code, and places where we were missing functionality
compared to the spec. They all work on the RI, many fail on Dalvik
luni/src/test/java/javax/net/ssl/AllTests.java
luni/src/test/java/javax/net/ssl/SSLContextTest.java
luni/src/test/java/javax/net/ssl/SSLSessionContextTest.java
luni/src/test/java/javax/net/ssl/SSLSessionTest.java
luni/src/test/java/javax/net/ssl/SSLSocketFactoryTest.java
luni/src/test/java/javax/net/ssl/SSLSocketTest.java
Adding my javax.net.ssl.AllTests to the main list
luni/src/test/java/tests/AllTests.java
Adding Bouncy Castle provider /usr/share/java/bcprov.jar to host
classpath for testing with --java-home /usr/lib/jvm/java-6-openjdk
tools/runner/java/dalvik/runner/JavaVm.java
Fix usage comment to reboot to bootloader
run-core-tests
Change-Id: I7a7998fc7bedc7a00b1836517d043c6a27c8bd4d
Elliott Hughes [Sat, 3 Apr 2010 00:19:21 +0000 (17:19 -0700)]
More Charset/ICU cleanup.
I've been feeling guilty about leaving broken double-checked locking (missing
the "volatile") in harmony's Charset code. A quick investigation showed that
the method that it's intended to optimize is basically never called, and the
RI's documentation explicitly says "don't call this; it's slow". So this patch
fixes that.
I've also improved our documentation.
I've also deleted a bunch of dead code.
I've also tidied up some dodgy native string handling.
Change-Id: Iad69ebb3459d9cc4c4ff37b255d458b83fe40132
Ben Cheng [Fri, 2 Apr 2010 23:25:54 +0000 (16:25 -0700)]
am
67050d11: am
bd1326d0: Clean up the codegen for invoking helper callout functions.
Merge commit '
67050d11e5afa7c2396bb0fc4f8d455ea2616f95' into dalvik-dev
* commit '
67050d11e5afa7c2396bb0fc4f8d455ea2616f95':
Clean up the codegen for invoking helper callout functions.
Ben Cheng [Fri, 2 Apr 2010 23:20:07 +0000 (16:20 -0700)]
am
bd1326d0: Clean up the codegen for invoking helper callout functions.
Ben Cheng [Fri, 2 Apr 2010 22:04:53 +0000 (15:04 -0700)]
Clean up the codegen for invoking helper callout functions.
All invoked functions are documented in compiler/codegen/arm/CalloutHelper.h
Bug:
2567981
Change-Id: Ia7cd4107272df1b0b5588fbcc0aafcc6d0723d60
Brian Carlstrom [Fri, 2 Apr 2010 22:59:31 +0000 (15:59 -0700)]
am
85948576: am
4ff253ff: Remove JSON License from NOTICE file
Merge commit '
85948576f0270265ebeca795f41447ad4f549c11' into dalvik-dev
* commit '
85948576f0270265ebeca795f41447ad4f549c11':
Remove JSON License from NOTICE file
Ben Cheng [Fri, 2 Apr 2010 22:59:29 +0000 (15:59 -0700)]
am
bf4d95ea: am
76cacb1f: Merge "Accept the "-Xjitdisableopt" flag as advertised." into froyo
Merge commit '
bf4d95ea7d2e86e93ab372f261baa348c03ef188' into dalvik-dev
* commit '
bf4d95ea7d2e86e93ab372f261baa348c03ef188':
Accept the "-Xjitdisableopt" flag as advertised.
Ben Cheng [Fri, 2 Apr 2010 22:59:26 +0000 (15:59 -0700)]
am
1071056d: am
a497359a: Fix a race condition in JIT state refresh under debugging / misc code cleanup.
Merge commit '
1071056dace973442293b718bf12e328935126f1' into dalvik-dev
* commit '
1071056dace973442293b718bf12e328935126f1':
Fix a race condition in JIT state refresh under debugging / misc code cleanup.
Brian Carlstrom [Fri, 2 Apr 2010 22:59:22 +0000 (15:59 -0700)]
am
3d82ade7: Merge "Have certimport.sh list certificates in BKS keystore after importing for verification/debugging"
Merge commit '
3d82ade7a9b764695bad89d2476a73441118411b' into dalvik-dev
* commit '
3d82ade7a9b764695bad89d2476a73441118411b':
Have certimport.sh list certificates in BKS keystore after importing for verification/debugging
Andy McFadden [Fri, 2 Apr 2010 22:59:18 +0000 (15:59 -0700)]
am
d4b07831: Merge "Fix misuse of ALLOC_DONT_TRACK." into froyo
Merge commit '
d4b078315ae7335c385f70b32810959bd228d976' into dalvik-dev
* commit '
d4b078315ae7335c385f70b32810959bd228d976':
Fix misuse of ALLOC_DONT_TRACK.
Brian Carlstrom [Fri, 2 Apr 2010 22:59:15 +0000 (15:59 -0700)]
am
ea527bc0: Remove debug message from OpenSSL JNI code
Merge commit '
ea527bc08f4d7128eb9d927a16723d20b9d1d217' into dalvik-dev
* commit '
ea527bc08f4d7128eb9d927a16723d20b9d1d217':
Remove debug message from OpenSSL JNI code
Elliott Hughes [Fri, 2 Apr 2010 22:59:11 +0000 (15:59 -0700)]
am
6e138297: Add an @KnownFailure annotation.
Merge commit '
6e138297538fb632944ae1a81f346aec75137399' into dalvik-dev
* commit '
6e138297538fb632944ae1a81f346aec75137399':
Add an @KnownFailure annotation.
Bill Buzbee [Fri, 2 Apr 2010 22:59:07 +0000 (15:59 -0700)]
am
434bae64: Fix for
2542488 JIT codegen bug with overlapping wide operands
Merge commit '
434bae646046871c334b95bd9123a78da66c27c3' into dalvik-dev
* commit '
434bae646046871c334b95bd9123a78da66c27c3':
Fix for
2542488 JIT codegen bug with overlapping wide operands
Ben Cheng [Fri, 2 Apr 2010 22:58:56 +0000 (15:58 -0700)]
am
d5adae17: Improve JIT self verifier test coverage to follow single-step instructions.
Merge commit '
d5adae17d71e86a1a5f3ae7825054e3249fb7879' into dalvik-dev
* commit '
d5adae17d71e86a1a5f3ae7825054e3249fb7879':
Improve JIT self verifier test coverage to follow single-step instructions.
Brian Carlstrom [Fri, 2 Apr 2010 22:01:36 +0000 (15:01 -0700)]
am
4ff253ff: Remove JSON License from NOTICE file
Brian Carlstrom [Fri, 2 Apr 2010 21:40:07 +0000 (14:40 -0700)]
Remove JSON License from NOTICE file
Change-Id: Ie4426f8e33ddef42916e88adeaf672714212d3a3
Elliott Hughes [Fri, 2 Apr 2010 18:47:56 +0000 (11:47 -0700)]
Add Java 6's java.util.ServiceLoader.
New implementation, documentation, and tests, very loosely based on the harmony
code.
We can't run the harmony or jtreg tests because we don't have the infrastructure.
My test just tests the most obvious use cases, on the assumption that at some
point we'll get the other test suites working; quite possibly before anyone ever
wants to use this stuff on Android.
(We might want to switch over existing META-INF/services/ code to use
ServiceLoader. I've raised http://b/
2567593 for this.)
Bug:
2497395
Change-Id: I62b0ac4748204555d3ba9356794a72aff4f4f01e
Jesse Wilson [Thu, 1 Apr 2010 22:44:05 +0000 (15:44 -0700)]
Removing APIs from dalvik.system that shouldn't have been published.
These APIs were deprecated in Eclair and should disappear in Gingerbread.
See bug
2553600.
Jesse Wilson [Thu, 1 Apr 2010 21:44:29 +0000 (14:44 -0700)]
Merge "New method-level granularity and output streaming for vogar." into dalvik-dev
Jesse Wilson [Thu, 1 Apr 2010 06:51:56 +0000 (23:51 -0700)]
New method-level granularity and output streaming for vogar.
Elliott Hughes [Thu, 1 Apr 2010 21:31:56 +0000 (14:31 -0700)]
Merge "Tidy up our getAvailableLocales methods to actually ask ICU4C." into dalvik-dev
Elliott Hughes [Thu, 1 Apr 2010 20:56:32 +0000 (13:56 -0700)]
Tidy up our getAvailableLocales methods to actually ask ICU4C.
These specialized methods are little used, and in several cases ICU itself
just returns the list of locales, but that's ICU's business, not ours. As
long as ICU is in charge of our locale-specific data, it should be responsible
for answering questions about what locale-specific data is available...
Change-Id: Idc8a66bbf7fcbc6b06e30929e6a7af3fe30ab7d1
Ben Cheng [Thu, 1 Apr 2010 20:54:24 +0000 (13:54 -0700)]
am
76cacb1f: Merge "Accept the "-Xjitdisableopt" flag as advertised." into froyo
Ben Cheng [Thu, 1 Apr 2010 20:32:30 +0000 (13:32 -0700)]
Merge "Accept the "-Xjitdisableopt" flag as advertised." into froyo
Ben Cheng [Thu, 1 Apr 2010 20:26:54 +0000 (13:26 -0700)]
Accept the "-Xjitdisableopt" flag as advertised.
Bug:
2542212
Change-Id: I6819bbbaf43ccb9a1e35cc576cfd6e5440b9578b
Andy McFadden [Thu, 1 Apr 2010 20:06:00 +0000 (13:06 -0700)]
Merge "Mark external alloc functions as deprecated." into dalvik-dev
Elliott Hughes [Thu, 1 Apr 2010 18:15:14 +0000 (11:15 -0700)]
Merge "Add Java 6's java.net.IDN." into dalvik-dev
Elliott Hughes [Wed, 31 Mar 2010 22:45:15 +0000 (15:45 -0700)]
Add Java 6's java.net.IDN.
harmony's tests and my code, though ICU4C does all the hard work.
I've added a test of my own to demonstrate some weird RI behavior (that I've
emulated in our implementation).
Bug:
2497395
Change-Id: I8146f72a8a3204449ee3d0d9065dadc1c1c77fcc
Elliott Hughes [Thu, 1 Apr 2010 01:34:53 +0000 (18:34 -0700)]
Fix an off-by-one error in fd range checking.
Change-Id: I15f932bc246ebc7fec9471a873bef8bd58ef15fc
Carl Shapiro [Wed, 31 Mar 2010 23:27:24 +0000 (16:27 -0700)]
Merge "Add the ability to treat the zygote heap as a root collect just the forked application heap." into dalvik-dev
Elliott Hughes [Wed, 31 Mar 2010 22:52:09 +0000 (15:52 -0700)]
Merge "Add Java 6's ResourceBundle/Properties API." into dalvik-dev
Andy McFadden [Wed, 31 Mar 2010 22:50:17 +0000 (15:50 -0700)]
Mark external alloc functions as deprecated.
First step toward disabling them.
Bug
2537379.
Change-Id: I8664a5f1d7dcff11ddeb97b5e700dad76bffc723
Ben Cheng [Wed, 31 Mar 2010 21:36:33 +0000 (14:36 -0700)]
am
a497359a: Fix a race condition in JIT state refresh under debugging / misc code cleanup.
Elliott Hughes [Wed, 31 Mar 2010 20:59:55 +0000 (13:59 -0700)]
Add Java 6's ResourceBundle/Properties API.
I've pretty much taken the upstream ResourceBundle implementations
as-is, putting back our string-to-locale conversion, removing a bit
of duplication and non-free, non-spec EBCDIC support, and hard-coding
the text of the MissingResourceExceptions (since harmony's changed
its message catalog from ours, so I had to touch those bits of the
code anyway).
(Why haven't I bothered to pay much attention to the resource bundle
implementations? Because I already rewrote our only code that was
using them to not use them, and third-party developers should be
using Android's resource system instead. There's very little chance
anyone needs Java resource bundles. I paid some attention to Properties,
because they're still somewhat useful.)
Also remove various unused messages, and update our tests. I've mostly
_not_ taken the upstream tests, because it would require a lot of work
that we'll be doing anyway when we switch to using their test suite
properly.
I ran the jtreg tests we're able to run, and the normal-case ones (plus
the stress test) seemed okay.
Bug:
2497395
Change-Id: I91606df0dc1a45e6974fbb27a0d334af87254f0b
Ben Cheng [Wed, 31 Mar 2010 18:59:18 +0000 (11:59 -0700)]
Fix a race condition in JIT state refresh under debugging / misc code cleanup.
Bug:
2561283
Change-Id: I9fd94928f3e661de97098808340ea92b28cafa07
Brian Carlstrom [Wed, 31 Mar 2010 17:37:16 +0000 (10:37 -0700)]
Merge "Have certimport.sh list certificates in BKS keystore after importing for verification/debugging"
Brian Carlstrom [Wed, 31 Mar 2010 17:01:09 +0000 (10:01 -0700)]
Have certimport.sh list certificates in BKS keystore after importing for verification/debugging
Change-Id: Ic336f10d96bbf93b1dc5cfd8b64a4c9eaa4f3a68
Elliott Hughes [Wed, 31 Mar 2010 15:55:17 +0000 (08:55 -0700)]
Merge "Add Java 6's Calendar API changes." into dalvik-dev
Elliott Hughes [Wed, 31 Mar 2010 00:47:11 +0000 (17:47 -0700)]
Add Java 6's Calendar API changes.
Also correct two javadoc mistakes I added, and bring back the latest harmony
java6 CalendarTest.
Bug:
2497395
Change-Id: If481390948ca93d5f709a8ed4585991889de9f8b
Andy McFadden [Wed, 31 Mar 2010 15:43:28 +0000 (08:43 -0700)]
Merge "Fix misuse of ALLOC_DONT_TRACK." into froyo
Jesse Wilson [Wed, 31 Mar 2010 06:37:04 +0000 (23:37 -0700)]
Merge "Splitting TestRun into Action and Outcome." into dalvik-dev
Jesse Wilson [Tue, 30 Mar 2010 22:53:36 +0000 (15:53 -0700)]
Splitting TestRun into Action and Outcome.
Changing Vogar to prefer the word "action" over "test" to avoid
deemphisizing benchmarks and main classes.
Moving expectation management out of TestRun and into Expectation
and the ExpectationStore. The parse method moved, but it is unchanged.
Renamed ExpectedResult to Expectation.
Currently outcome has 2 names: an outcome name and an action name.
At the moment these are always equal. In a follow up to this change
I intend to allow a single action to have multiple outcomes, which
will allow JUnit tests to be tracked at the right granularity when
executed by vogar.
Carl Shapiro [Fri, 12 Mar 2010 04:39:47 +0000 (20:39 -0800)]
Add the ability to treat the zygote heap as a root collect just the
forked application heap.
Change-Id: I8807897ae426f8274018d950fec44a2182a90525
Brian Carlstrom [Tue, 30 Mar 2010 23:28:48 +0000 (16:28 -0700)]
Remove debug message from OpenSSL JNI code
Change-Id: I70c68087b7d109634eb3240dca1f27e6f20d3da6
Andy McFadden [Tue, 30 Mar 2010 22:49:07 +0000 (15:49 -0700)]
Fix misuse of ALLOC_DONT_TRACK.
The internal String creation function doesn't allow ALLOC_DONT_TRACK.
This changes the call to use ALLOC_DEFAULT and then explicitly release
the tracked allocation.
For bug
2558142.
Change-Id: I57dfa4824578c3a3a33f6836b75f51391cc73746
Elliott Hughes [Tue, 30 Mar 2010 22:19:23 +0000 (15:19 -0700)]
Merge "Trivial tidying up of networking code." into dalvik-dev
Elliott Hughes [Tue, 30 Mar 2010 22:18:26 +0000 (15:18 -0700)]
Add an @KnownFailure annotation.
Bug:
2489458
Change-Id: Ib1121c6190b63baae8dbc6a8a598c3f5a510cfaf
Elliott Hughes [Tue, 30 Mar 2010 21:21:19 +0000 (14:21 -0700)]
Trivial tidying up of networking code.
Removing cruft and renaming things.
Change-Id: I317726c40a1addf3a1ad9d905239438424082549
Jesse Wilson [Tue, 30 Mar 2010 20:05:32 +0000 (13:05 -0700)]
Merge "Fixing vogar script to use the latest name" into dalvik-dev
Jesse Wilson [Tue, 30 Mar 2010 20:05:09 +0000 (13:05 -0700)]
Fixing vogar script to use the latest name
Jesse Wilson [Tue, 30 Mar 2010 01:09:29 +0000 (18:09 -0700)]
Renaming dalvik.runner to Vogar!
Also moving commands and target classes to their own directories. This is all
in preparation to move the code out to code.google.com
Elliott Hughes [Tue, 30 Mar 2010 03:51:48 +0000 (20:51 -0700)]
Fix a bug, and protect against an unrelated class of bugs.
If the Java array allocation in InetAddress.cpp failed, we'd free NULL instead of the
previously-allocated structure. This is a new bug in froyo, but only happens in out of
memory situations, so doesn't seem worth fixing there.
Unrelatedly, let's disallow assignment and copying of all our RAII classes. This isn't
a mistake I've seen made, but it's easy to protect against, so we may as well do so
consistently.
Change-Id: I2433b31ff983d388788b09e59e08d661f1725ecd
Elliott Hughes [Tue, 30 Mar 2010 01:35:30 +0000 (18:35 -0700)]
Merge "Add Java 6's exponent separator to DecimalFormatSymbols." into dalvik-dev
Elliott Hughes [Tue, 30 Mar 2010 00:39:51 +0000 (17:39 -0700)]
Add Java 6's exponent separator to DecimalFormatSymbols.
Bug:
2497395
Change-Id: Ic552fa828649bae882e508a62a44073d1038b5c0
Jesse Wilson [Tue, 30 Mar 2010 00:21:31 +0000 (17:21 -0700)]
Merge "Tweak our test & runner so XPath tests can be executed on Hudson." into dalvik-dev
Jesse Wilson [Mon, 29 Mar 2010 23:13:48 +0000 (16:13 -0700)]
Tweak our test & runner so XPath tests can be executed on Hudson.
Elliott Hughes [Mon, 29 Mar 2010 22:20:01 +0000 (15:20 -0700)]
Fix build.
Rather than try to be clever with header files (which didn't work with glibc
for the sim build) let's make Math.copySign have the StrictMath behavior,
and have StrictMath call Math. (The other way round, though it might seem
more logical, wouldn't solve the problem. We already have numerous cases of
StrictMath calling Math anyway.)
Change-Id: Ifff065ddc8fbd5d5f8d4d5b67bc9ac07a719eb00
Jesse Wilson [Mon, 29 Mar 2010 20:52:59 +0000 (13:52 -0700)]
Merge "Merge commit '
8812fdd7' into manualmerge" into dalvik-dev
Jesse Wilson [Mon, 29 Mar 2010 20:52:17 +0000 (13:52 -0700)]
Merge commit '
8812fdd7' into manualmerge
Conflicts:
libcore/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
Elliott Hughes [Mon, 29 Mar 2010 20:43:29 +0000 (13:43 -0700)]
Merge "Fix StrictMath.copySign's behavior with NaN." into dalvik-dev
Bill Buzbee [Sat, 27 Mar 2010 17:58:03 +0000 (10:58 -0700)]
Fix for
2542488 JIT codegen bug with overlapping wide operands
Change-Id: I2f31492f68cb753f76dd664cd6b0a52d7d32de4c
Elliott Hughes [Sat, 27 Mar 2010 06:23:38 +0000 (23:23 -0700)]
Fix StrictMath.copySign's behavior with NaN.
StrictMath's copySign method is defined to treat all NaNs as positive, regardless
of their sign bit. Rather than add yet more code on the Java side (which already
called down to native code three times), let's just make one call to native code.
This change fixes failures in already-committed StrictMath tests.
The only other potential instances of this class of error were in the
max and min methods, but they all handle NaNs before calling
(double|float)To(Raw)?LongBits, so the choice there really is arbitrary.
Change-Id: I439dbdff9068cb420b78a6330cde9d7d0d12c0ef
Elliott Hughes [Sat, 27 Mar 2010 00:46:16 +0000 (17:46 -0700)]
Fix all our java.text.Bidi failures.
Two are invalid tests where we behave the same as the RI. The third reflects
a difference between ICU4C and the RI, so I've added code to recognize that
case and paper over the crack. I've also tidied up a bit more.
With any luck, I'll never see these files again...
Change-Id: I278502fbdea039e9a2318df830dc0b55851e96c0
Ben Cheng [Sat, 27 Mar 2010 00:45:28 +0000 (17:45 -0700)]
Improve JIT self verifier test coverage to follow single-step instructions.
Bug:
2549326
Change-Id: I01412d4aac1379b61c90fe6e59c534b33be93f66
Elliott Hughes [Fri, 26 Mar 2010 23:16:30 +0000 (16:16 -0700)]
Merge "Java 6 changed CollationKey from final to abstract." into dalvik-dev
Jesse Wilson [Fri, 26 Mar 2010 23:08:43 +0000 (16:08 -0700)]
am
2be0c815: (-s ours) Suppressing additional tests that fail in Froyo.
Merge commit '
2be0c815dda289b09f3bb26f751c124f30eaf612' into dalvik-dev
* commit '
2be0c815dda289b09f3bb26f751c124f30eaf612':
Suppressing additional tests that fail in Froyo.
Elliott Hughes [Fri, 26 Mar 2010 21:46:11 +0000 (14:46 -0700)]
Java 6 changed CollationKey from final to abstract.
I've also taken the opportunity to tidy up our implementation a little,
though my hands are tied by (a) the fact that our concrete classes are
in a separate package from our abstract classes and (b) frameworks/base
actually pokes about with our icu4jni collation code (http://b/
2417080).
I've also tidied up a bunch of dead code. In particular, it's silly for
us to check parameters in Java that will be checked in native code (and
that one would assume will be valid most of the time anyway).
Bug:
1635883
Change-Id: I7db3c1ff1f0d23cb85604f9c8eb995e4488d7c0a
Jesse Wilson [Fri, 26 Mar 2010 22:21:11 +0000 (15:21 -0700)]
Merge "Fixing tests to handle changes in our behaviour since DOM 3." into froyo
Jesse Wilson [Fri, 26 Mar 2010 21:49:30 +0000 (14:49 -0700)]
Suppressing additional tests that fail in Froyo.
Our File class doesn't do SecurityManager checks at the same time as it
did previously.
We added a failing logging test but not the fix.
We moved the SQL drivers around, causing some SQL tests to fail.
A new logging test doesn't load its resources using the safe pattern.
Change-Id: I34ab81e4001969aa536f61a89c277ae2b879d49d
Jesse Wilson [Fri, 26 Mar 2010 21:03:36 +0000 (14:03 -0700)]
Fixing tests to handle changes in our behaviour since DOM 3.
Our exception priority has changed for DOM attributes. We
previously used to throw DOMExceptions with namespace error
codes and now throw DOMExceptions with character error codes
when the attribute name is malformed. This caused changes to
many tests.
Another notable behaviour change is that we now supply the
qname (like the RI) where previously we did not. It is optional,
but we now include it for RI-consistency.
Yet another behaviour change is that we don't look at System
properties when choosing a SAX implementation. This simplifies
our internals significantly. End users who want an alternative
SAX implementation should construct it manually.
Also adding @KnownFailure tags for new tests that we have
never yet passed.
Change-Id: I6f81bedd7c2a0867086dc507b3220c2b07c4d3d3
Elliott Hughes [Fri, 26 Mar 2010 18:30:00 +0000 (11:30 -0700)]
Start cleaning up the Charset implementation.
This was going to be https://issues.apache.org/jira/browse/HARMONY-6461,
but I couldn't resist cleaning up some of the surrounding code, and ended
up cleaning up some of our native code too. In the course of the afternoon
I spent on this, I lost my conviction that the upstream change makes
sense, so I reverted that, leaving this change just pure cleanup.
(Note that the cleanup work is incomplete. This is an improvement, but
there's plenty left to do. I just don't want to get too distracted until
all the Java 6 changes are done.)
Change-Id: I56841db5f6c038bbf7942e83a148dca546519269
Elliott Hughes [Fri, 26 Mar 2010 18:05:38 +0000 (11:05 -0700)]
Merge "Use more idiomatic naming in test code." into dalvik-dev
Elliott Hughes [Fri, 26 Mar 2010 17:51:48 +0000 (10:51 -0700)]
Use more idiomatic naming in test code.
(I introduced this in https://android-git.corp.google.com/g/46305.)
Change-Id: I100202fc18e246dd7b66870ce75543642505336d
Ben Cheng [Thu, 25 Mar 2010 23:55:50 +0000 (16:55 -0700)]
am
63868feb: Use correct resource flags for Dalvik ld/st instructions to enable code motion.
Merge commit '
63868feb2cc6a1fb1c76d7b54296ef4869f632be' into dalvik-dev
* commit '
63868feb2cc6a1fb1c76d7b54296ef4869f632be':
Use correct resource flags for Dalvik ld/st instructions to enable code motion.
Ben Cheng [Thu, 25 Mar 2010 23:16:02 +0000 (16:16 -0700)]
Use correct resource flags for Dalvik ld/st instructions to enable code motion.
Change-Id: I9b371af4150b6245c0ff59eea63d83406edbbcee
Jesse Wilson [Thu, 25 Mar 2010 21:40:39 +0000 (14:40 -0700)]
am
f2f7880a: Test and document our handling of nulls with getString().
Merge commit '
f2f7880a40aed1c8d9c27db49226e47396556aac' into dalvik-dev
* commit '
f2f7880a40aed1c8d9c27db49226e47396556aac':
Test and document our handling of nulls with getString().
Jesse Wilson [Thu, 25 Mar 2010 20:31:43 +0000 (13:31 -0700)]
Test and document our handling of nulls with getString().
Our behaviour is consistent with Crockford's.
The test confirms that the behaviour is consistent with the report
of that bug, which the submitter claims is not how it should behave.
http://code.google.com/p/android/issues/detail?id=7257
Change-Id: Ibace4bd995e3cbc8fb6c9dc509f8f4491865a647
Bill Buzbee [Thu, 25 Mar 2010 20:11:50 +0000 (13:11 -0700)]
am
d630700a: Merge "Jit: Fix for
2542488 JIT codegen bug with overlapping wide operands"
Merge commit '
d630700a9fbc6d317e0b4df73cbbc74a2c8fadaa' into dalvik-dev
* commit '
d630700a9fbc6d317e0b4df73cbbc74a2c8fadaa':
Jit: Fix for
2542488 JIT codegen bug with overlapping wide operands
Bill Buzbee [Thu, 25 Mar 2010 20:07:45 +0000 (13:07 -0700)]
Merge "Jit: Fix for
2542488 JIT codegen bug with overlapping wide operands"
Elliott Hughes [Thu, 25 Mar 2010 18:30:13 +0000 (11:30 -0700)]
Apply https://issues.apache.org/jira/browse/HARMONY-4307.
They didn't add a test for this; supposedly it fixed a flaky AWT test. But
the change looks plausible.
Change-Id: I358849a20d5e38d01d6c77a4c335002bb7bba095
Elliott Hughes [Thu, 25 Mar 2010 17:39:48 +0000 (10:39 -0700)]
Clean up a few toStrings.
I couldn't find any more that were using getClass() rather than
getClass().getName().
Change-Id: I30b375748d36bc36d1e6999349fc472496456746
Bill Buzbee [Thu, 25 Mar 2010 17:38:34 +0000 (10:38 -0700)]
Jit: Fix for
2542488 JIT codegen bug with overlapping wide operands
Change-Id: I7b922e223fe1f5242d1f3db1fa18f54aaed725af
Elliott Hughes [Thu, 25 Mar 2010 17:25:17 +0000 (10:25 -0700)]
am
ec7c8c98: Fix java.util.Random\'s constructors.
Merge commit '
ec7c8c98a4094580224eb9c400249c5c0984cf29' into dalvik-dev
* commit '
ec7c8c98a4094580224eb9c400249c5c0984cf29':
Fix java.util.Random's constructors.
Elliott Hughes [Thu, 25 Mar 2010 06:38:48 +0000 (23:38 -0700)]
Fix java.util.Random's constructors.
Subclasses rely on having their overridden setSeed called by Random's
constructors, and the RI actually documents this behavior. (The
documentation even changed between Java 5 and Java 6 to make it _more_
explicit.)
This patch keeps that part of I6239d93bb46876ef1c4a5e155a6dc1ac6fab4eae
that improved our randomness, but reverts the attempt to fix Random's
uncouth behavior.
Also a regression test so we don't try to fix Random again in future.
Bug:
2502231
Change-Id: Ieea1009145c74eac9475c0cd5066dabad20eb114
Kenny Root [Thu, 25 Mar 2010 02:40:12 +0000 (19:40 -0700)]
am
f87ab961: Merge "Don\'t leak memory on failed pipe or mutex init"
Merge commit '
f87ab9616697b8bae08c5e8007cbdd0039a1f8ce' into dalvik-dev
* commit '
f87ab9616697b8bae08c5e8007cbdd0039a1f8ce':
Don't leak memory on failed pipe or mutex init
Ben Cheng [Thu, 25 Mar 2010 02:40:10 +0000 (19:40 -0700)]
am
3d5d8736: Merge "Fix for the JIT blocking mode plus some code cleanup."
Merge commit '
3d5d87364d062734753bfd26336e96a7e8d03360' into dalvik-dev
* commit '
3d5d87364d062734753bfd26336e96a7e8d03360':
Fix for the JIT blocking mode plus some code cleanup.
Andy McFadden [Thu, 25 Mar 2010 02:40:04 +0000 (19:40 -0700)]
am
c66affa4: Switch to VMWAIT while outputting trace data.
Merge commit '
c66affa440de113df861928c528fcbbead2ead45' into dalvik-dev
* commit '
c66affa440de113df861928c528fcbbead2ead45':
Switch to VMWAIT while outputting trace data.