OSDN Git Service
The Android Open Source Project [Thu, 11 Feb 2010 18:02:33 +0000 (10:02 -0800)]
merge from open-source master
Jack Veenstra [Thu, 28 Jan 2010 23:57:02 +0000 (15:57 -0800)]
Fix a couple minor bugs (bug
2404859) in TraceDump.c
1. A switch statement was missing a "break" after option letter "f".
2. The heavily-used function "lookupMethod()" had an expression using mod (%) instead of bitwise-and (&).
Rodrigo Ipince [Fri, 18 Dec 2009 02:07:28 +0000 (18:07 -0800)]
Added support for filter in dmtracedump tool, along with some test cases.
Some corner cases are still not handled in the code, but will be eventually.
Rodrigo Ipince [Thu, 22 Oct 2009 20:21:02 +0000 (13:21 -0700)]
Fix for unmatched entry/exit points in test traces
Added support for the creation of test traces with unmatched entries/exits (current implementation segfaulted in some cases)
The Android Open Source Project [Fri, 5 Feb 2010 16:40:23 +0000 (08:40 -0800)]
am
217f8ef4: reconcile main tree with open-source eclair
Merge commit '
217f8ef4c1c151c63382dc0785edd960c233f62e' into eclair-plus-aosp
* commit '
217f8ef4c1c151c63382dc0785edd960c233f62e':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:32 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:07:39 +0000 (14:07 -0800)]
reconcile android-2.1_r1 snapshot
Brett Chabot [Fri, 22 Jan 2010 00:10:26 +0000 (16:10 -0800)]
am
0e9d568e: Merge "Mark libcore cert tests using expired certs as known failures." into eclair
Merge commit '
0e9d568ec6b946e77bc0ec1903acac1ef916e6d1' into eclair-plus-aosp
* commit '
0e9d568ec6b946e77bc0ec1903acac1ef916e6d1':
Mark libcore cert tests using expired certs as known failures.
Brett Chabot [Fri, 22 Jan 2010 00:06:15 +0000 (16:06 -0800)]
Merge "Mark libcore cert tests using expired certs as known failures." into eclair
Brett Chabot [Thu, 21 Jan 2010 23:01:34 +0000 (15:01 -0800)]
Mark libcore cert tests using expired certs as known failures.
Bug
2322662
Change-Id: If35a5a75f664535bd4eb97cf11a6afe5b0e5b4a9
Brett Chabot [Thu, 21 Jan 2010 22:25:46 +0000 (14:25 -0800)]
am
c4f93305: Fix for DecimalFormatTest#test_formatToCharacterIteratorLjava_lang_Object
Merge commit '
c4f93305d1fe3d31660af2b47a90d2ebbc6d58f9' into eclair-plus-aosp
* commit '
c4f93305d1fe3d31660af2b47a90d2ebbc6d58f9':
Fix for DecimalFormatTest#test_formatToCharacterIteratorLjava_lang_Object
Brett Chabot [Thu, 21 Jan 2010 20:10:42 +0000 (12:10 -0800)]
Fix for DecimalFormatTest#test_formatToCharacterIteratorLjava_lang_Object
Add additional logic to skip checks that require specific locales.
Bug
2386416
Change-Id: Icc30e04d393a22b272966555e617598323aefa0b
The Android Open Source Project [Tue, 12 Jan 2010 23:18:14 +0000 (15:18 -0800)]
android-2.1_r1 snapshot
Brett Chabot [Tue, 12 Jan 2010 01:19:26 +0000 (17:19 -0800)]
am
56176a05: Fix ScannerTest failures.
Merge commit '
56176a05205eaf469469c26988e99077aed0d7e7' into eclair-plus-aosp
* commit '
56176a05205eaf469469c26988e99077aed0d7e7':
Fix ScannerTest failures.
Brett Chabot [Mon, 11 Jan 2010 21:43:59 +0000 (13:43 -0800)]
Fix ScannerTest failures.
Skip more tests if required locales are not present.
Change-Id: I562da3222bccd6f264714d10f8db57e087e2561a
Brett Chabot [Mon, 11 Jan 2010 21:51:48 +0000 (13:51 -0800)]
am
53a6c01c: Fix DecimalFormatTest#test_serializationHarmonyRICompatible.
Merge commit '
53a6c01cd8c8560b8eef891871c7260f6cbe71d9' into eclair-plus-aosp
* commit '
53a6c01cd8c8560b8eef891871c7260f6cbe71d9':
Fix DecimalFormatTest#test_serializationHarmonyRICompatible.
Brett Chabot [Fri, 8 Jan 2010 23:50:00 +0000 (15:50 -0800)]
Fix DecimalFormatTest#test_serializationHarmonyRICompatible.
Skip the test if required Locale is not present.
Bug
2343677
Change-Id: I0f2672bd4b56cc1685e7368921aaa1e9d4492cf0
Brett Chabot [Tue, 22 Dec 2009 22:06:21 +0000 (14:06 -0800)]
am
6cdbef55: Merge change I1d9b205f into eclair
Merge commit '
6cdbef55a948dffbeff211fb4e78066c053ecc2e' into eclair-plus-aosp
* commit '
6cdbef55a948dffbeff211fb4e78066c053ecc2e':
Skip locale dependent libcore tests if required locales are not present.
Android (Google) Code Review [Tue, 22 Dec 2009 22:02:50 +0000 (14:02 -0800)]
Merge change I1d9b205f into eclair
* changes:
Skip locale dependent libcore tests if required locales are not present.
Brett Chabot [Fri, 18 Dec 2009 23:32:59 +0000 (15:32 -0800)]
Skip locale dependent libcore tests if required locales are not present.
Previously these tests were marked as KnownFailures - which is undesirable since
they can pass if the right Locale's are present on target.
Bug
2335906
Change-Id: I1d9b205f740b71880c57b48f069c302c5cec8792
Scott Main [Mon, 21 Dec 2009 20:33:18 +0000 (12:33 -0800)]
resolved conflicts for merge of
ed7b1e77 to eclair-plus-aosp
Android (Google) Code Review [Mon, 21 Dec 2009 19:57:14 +0000 (11:57 -0800)]
Merge change I0ffa1dd4 into eclair
* changes:
doc change: fix a broken link in class summary
Scott Main [Mon, 21 Dec 2009 19:53:59 +0000 (11:53 -0800)]
doc change: fix a broken link in class summary
Brett Chabot [Tue, 15 Dec 2009 18:59:23 +0000 (10:59 -0800)]
am
173411f7: Temporarily omit libcore tests that fail when run in CTS harness. DO NOT MERGE.
Merge commit '
173411f7a11c81bef07adc28c66ce4c417df67ff' into eclair-plus-aosp
* commit '
173411f7a11c81bef07adc28c66ce4c417df67ff':
Temporarily omit libcore tests that fail when run in CTS harness. DO NOT MERGE.
Brett Chabot [Mon, 14 Dec 2009 23:49:13 +0000 (15:49 -0800)]
Temporarily omit libcore tests that fail when run in CTS harness. DO NOT MERGE.
Bug
2155700
Change-Id: Ib0f9d363842d713ce3e07cdd303078c5c3e518c9
Dan Bornstein [Tue, 8 Dec 2009 00:58:08 +0000 (16:58 -0800)]
am
4a888b09: Two exception-related tweaks: (1) Make the dynamic exception construction mechanism be able to handle exception constructors that take Object instead of String. (2) Add a convenience in JNIHelp to throw RuntimeExceptions.
Merge commit '
4a888b09be2ade9fc5bb0137f702b3be889679a9' into eclair-plus-aosp
* commit '
4a888b09be2ade9fc5bb0137f702b3be889679a9':
Two exception-related tweaks: (1) Make the dynamic exception construction
Dan Bornstein [Mon, 7 Dec 2009 23:46:23 +0000 (15:46 -0800)]
Two exception-related tweaks: (1) Make the dynamic exception construction
mechanism be able to handle exception constructors that take Object instead
of String. (2) Add a convenience in JNIHelp to throw RuntimeExceptions.
Change-Id: Ie5ce680c30043a4b186e59d7c8883666648b2c87
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:05:56 +0000 (14:05 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:05:35 +0000 (12:05 -0800)]
merge from eclair
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:45:15 +0000 (18:45 -0800)]
eclair snapshot
Brett Chabot [Mon, 9 Nov 2009 19:48:49 +0000 (11:48 -0800)]
am
3dc6a811: DO NOT MERGE. CTS test cleanup. Mark tests as KnownFailures and BrokenTests.
Merge commit '
3dc6a81182178a8ac9570a7679cf24b6a2665a0b' into eclair-plus-aosp
* commit '
3dc6a81182178a8ac9570a7679cf24b6a2665a0b':
DO NOT MERGE. CTS test cleanup. Mark tests as KnownFailures and BrokenTests.
Brett Chabot [Thu, 5 Nov 2009 18:52:02 +0000 (10:52 -0800)]
DO NOT MERGE. CTS test cleanup. Mark tests as KnownFailures and BrokenTests.
Brett Chabot [Thu, 8 Oct 2009 18:18:20 +0000 (11:18 -0700)]
am
3238cc2a: am
32f89821: Merge change 26044 into donut-gms
Merge commit '
3238cc2a901ed6e0e3bb11fa601913c2ed09ddb7' into eclair-plus-aosp
* commit '
3238cc2a901ed6e0e3bb11fa601913c2ed09ddb7':
Remove tests.api.java.io.FileTest#test_delete as known failure.
Brett Chabot [Thu, 8 Oct 2009 18:18:10 +0000 (11:18 -0700)]
am
98f0612b: am
c4d33d9d: Fix ClassLoaderTest to work on DEXPREOPT builds.
Merge commit '
98f0612b22111dd9e2d23b171b9059582cc44991' into eclair-plus-aosp
* commit '
98f0612b22111dd9e2d23b171b9059582cc44991':
Fix ClassLoaderTest to work on DEXPREOPT builds.
Brett Chabot [Thu, 8 Oct 2009 17:44:24 +0000 (10:44 -0700)]
am
32f89821: Merge change 26044 into donut-gms
Merge commit '
32f8982116e5155bc3c75c86e3c861cab1a848be' into eclair
* commit '
32f8982116e5155bc3c75c86e3c861cab1a848be':
Remove tests.api.java.io.FileTest#test_delete as known failure.
Brett Chabot [Thu, 8 Oct 2009 17:44:19 +0000 (10:44 -0700)]
am
c4d33d9d: Fix ClassLoaderTest to work on DEXPREOPT builds.
Merge commit '
c4d33d9d89444d86808be7072e0548007d98a49f' into eclair
* commit '
c4d33d9d89444d86808be7072e0548007d98a49f':
Fix ClassLoaderTest to work on DEXPREOPT builds.
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
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.
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.
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.
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 [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().
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.
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
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.
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.)
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.)
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.
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).
Android (Google) Code Review [Sun, 20 Sep 2009 22:56:46 +0000 (18:56 -0400)]
Merge change 26044 into donut-gms
* changes:
Remove tests.api.java.io.FileTest#test_delete as known failure.
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.
Brett Chabot [Sun, 20 Sep 2009 22:25:29 +0000 (15:25 -0700)]
Remove tests.api.java.io.FileTest#test_delete as known failure.
BUG
2133089
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: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.
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.
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.
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.
Brett Chabot [Thu, 17 Sep 2009 03:11:29 +0000 (20:11 -0700)]
Fix ClassLoaderTest to work on DEXPREOPT builds.
ie jars without classes.dex. BUG
2000272
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.