OSDN Git Service
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.
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
Lorenzo Colitti [Wed, 16 Sep 2009 02:37:54 +0000 (19:37 -0700)]
Report the cause of name lookup failures to Java land. The Java code already
uses the exception thrown by getallbyname() as a chained exception.
Change-Id: Ifc0d34102412ce0bf34715c9852bf751b420fb40
Lorenzo Colitti [Wed, 16 Sep 2009 01:24:49 +0000 (18:24 -0700)]
am
1cf3dbce: Merge change 25160 into eclair
Merge commit '
1cf3dbce0b94ae5427ef19422224627e20808364' into eclair-plus-aosp
* commit '
1cf3dbce0b94ae5427ef19422224627e20808364':
Make getHostByAddr and getHostByName return the proper object type.
Elliott Hughes [Wed, 16 Sep 2009 01:24:45 +0000 (18:24 -0700)]
am
cb12fde6: Make Resources preloadable again.
Merge commit '
cb12fde6b095f1cc38351d5998c10e1e7f0af25c' into eclair-plus-aosp
* commit '
cb12fde6b095f1cc38351d5998c10e1e7f0af25c':
Make Resources$DefaultTimeZones preloadable again.
Android (Google) Code Review [Wed, 16 Sep 2009 01:16:58 +0000 (21:16 -0400)]
Merge change 25160 into eclair
* changes:
Make getHostByAddr and getHostByName return the proper object type.
Elliott Hughes [Wed, 16 Sep 2009 00:02:16 +0000 (17:02 -0700)]
Make Resources$DefaultTimeZones preloadable again.
http://s9/81864 was a premature optimization that stopped the timezone data
being loaded in the zygote. So instead of paying the (admittedly large) time
and space costs once in the zygote, we now pay them once per application.
Revert the problematic parts of that change. Note that this isn't simply a
reverse patch:
1. I've changed the comment to make it clear that although
this *looks* like idiomatic lazy initialization, it's actually the opposite.
A comment to that effect might have prevented this code from being broken.
2. I've left the last two hunks of the original patch stand, because they
appear reasonable but unrelated.
Bug:
1941311,
1819285.
Lorenzo Colitti [Tue, 15 Sep 2009 23:20:51 +0000 (16:20 -0700)]
Make getHostByAddr and getHostByName return the proper object type.
Change-Id: I51c75205095b7fe093ccb4451bbf7cc6a287bc49
Jesse Wilson [Mon, 14 Sep 2009 18:23:39 +0000 (11:23 -0700)]
First cut at a tool to perform automated syncs from Harmony to Dalvik.
Much of the work of the tool is managing three versions of our code:
- the current Harmony code
- the current Dalvik code
- the common ancestor, an older version of Harmony
The tool calls out to the command line to perform the actual filesystem
work. Eventually I'd like to support all of our modules, and also
gathering diffs to send upstream to Harmony.
Urs Grob [Tue, 15 Sep 2009 16:18:11 +0000 (09:18 -0700)]
am
e937b1b2: Merge change 24110 into eclair
Merge commit '
e937b1b2d90dd9c1151f16af045c0fff1453c34e' into eclair-plus-aosp
* commit '
e937b1b2d90dd9c1151f16af045c0fff1453c34e':
JarFile was not able to verify signed files with size 0.
Android (Google) Code Review [Tue, 15 Sep 2009 15:49:33 +0000 (11:49 -0400)]
Merge change 24110 into eclair
* changes:
JarFile was not able to verify signed files with size 0.
Jean-Baptiste Queru [Tue, 15 Sep 2009 14:54:32 +0000 (07:54 -0700)]
merge from open-source master
San Mehat [Mon, 14 Sep 2009 22:38:36 +0000 (15:38 -0700)]
am
da03242f: Merge change 24840 into eclair
Merge commit '
da03242fe03a5ab342a6310b1e754e131ea628c9' into eclair-plus-aosp
* commit '
da03242fe03a5ab342a6310b1e754e131ea628c9':
dalvik: Switch to common cutils sched_policy api
Android (Google) Code Review [Mon, 14 Sep 2009 22:31:53 +0000 (18:31 -0400)]
Merge change 24840 into eclair
* changes:
dalvik: Switch to common cutils sched_policy api
Jesse Wilson [Mon, 14 Sep 2009 20:38:26 +0000 (13:38 -0700)]
am
2d34a33a: Merge change 23348 into eclair
Merge commit '
2d34a33a3d14ceda01c9bddfd957c3b9d3c55aa1' into eclair-plus-aosp
* commit '
2d34a33a3d14ceda01c9bddfd957c3b9d3c55aa1':
Update crypto package to Harmony r802921. Only Javadoc changes.
Android (Google) Code Review [Mon, 14 Sep 2009 20:27:39 +0000 (16:27 -0400)]
Merge change 23348 into eclair
* changes:
Update crypto package to Harmony r802921. Only Javadoc changes.
Jesse Wilson [Mon, 14 Sep 2009 17:46:42 +0000 (10:46 -0700)]
am
023a932a: Merge change 24788 into eclair
Merge commit '
023a932add8087c96d59ea74135b28bb5e1ac16d' into eclair-plus-aosp
* commit '
023a932add8087c96d59ea74135b28bb5e1ac16d':
Fixing the delimiter for the HTTP "Accept" header to be well-formed.
Android (Google) Code Review [Mon, 14 Sep 2009 17:39:08 +0000 (13:39 -0400)]
Merge change 24788 into eclair
* changes:
Fixing the delimiter for the HTTP "Accept" header to be well-formed.
San Mehat [Sat, 12 Sep 2009 17:10:13 +0000 (10:10 -0700)]
dalvik: Switch to common cutils sched_policy api
Signed-off-by: San Mehat <san@google.com>
Bob Lee [Sat, 12 Sep 2009 06:05:53 +0000 (23:05 -0700)]
am
efa0dcd5: Merge change 24508 into eclair
Merge commit '
efa0dcd52c030d2ace844070902979dd09e2c881' into eclair-plus-aosp
* commit '
efa0dcd52c030d2ace844070902979dd09e2c881':
Addressed reviewer comments.
Android (Google) Code Review [Sat, 12 Sep 2009 05:57:05 +0000 (01:57 -0400)]
Merge change 24508 into eclair
* changes:
Addressed reviewer comments.
Raphael [Fri, 11 Sep 2009 23:34:25 +0000 (16:34 -0700)]
am
00c464ff: Merge change 24751 into eclair
Merge commit '
00c464ff62c27dc12ef70f3b2d97e8b356ad21e0' into eclair-plus-aosp
* commit '
00c464ff62c27dc12ef70f3b2d97e8b356ad21e0':
Windows SDK: add support for -J option to dx.bat
Android (Google) Code Review [Fri, 11 Sep 2009 23:24:46 +0000 (19:24 -0400)]
Merge change 24751 into eclair
* changes:
Windows SDK: add support for -J option to dx.bat
Jesse Wilson [Fri, 11 Sep 2009 23:20:49 +0000 (16:20 -0700)]
Fixing the delimiter for the HTTP "Accept" header to be well-formed.
See bug
2107897.
Raphael [Fri, 11 Sep 2009 20:33:59 +0000 (13:33 -0700)]
Windows SDK: add support for -J option to dx.bat
BUG
1999508
Change-Id: I0c481d2cc0a96d1ca83aaa56c46c73eae17c2246
Bob Lee [Wed, 9 Sep 2009 22:36:29 +0000 (00:36 +0200)]
Addressed reviewer comments.
Lorenzo Colitti [Fri, 11 Sep 2009 20:27:24 +0000 (13:27 -0700)]
am
9ccfb95e: Merge change 24723 into eclair
Merge commit '
9ccfb95e597a93020f2731c734c2a65e743fb601' into eclair-plus-aosp
* commit '
9ccfb95e597a93020f2731c734c2a65e743fb601':
Remove code duplication in InetAddress.getByAddress.
Android (Google) Code Review [Fri, 11 Sep 2009 20:20:28 +0000 (16:20 -0400)]
Merge change 24723 into eclair
* changes:
Remove code duplication in InetAddress.getByAddress.
Lorenzo Colitti [Fri, 11 Sep 2009 18:28:51 +0000 (11:28 -0700)]
Remove code duplication in InetAddress.getByAddress.
Change-Id: Id2d72572fbe5b26ff4be9a2c959c41a48b859ea0
Lorenzo Colitti [Fri, 11 Sep 2009 19:16:32 +0000 (12:16 -0700)]
am
1e49340a: Merge change 24320 into eclair
Merge commit '
1e49340a8249b147a2bb4f12e242ac5aedbddece' into eclair-plus-aosp
* commit '
1e49340a8249b147a2bb4f12e242ac5aedbddece':
Simplify networking code initialization using static structures instead of code.
Android (Google) Code Review [Fri, 11 Sep 2009 19:06:47 +0000 (15:06 -0400)]
Merge change 24320 into eclair
* changes:
Simplify networking code initialization using static structures instead of code. Fix an uninitialized variable.
Jesse Wilson [Fri, 11 Sep 2009 17:58:54 +0000 (10:58 -0700)]
am
173086a3: Merge change 24620 into eclair
Merge commit '
173086a363fd54e9e905409d3db06b01dbd0ccbd' into eclair-plus-aosp
* commit '
173086a363fd54e9e905409d3db06b01dbd0ccbd':
Fix cert code to use the String form for TELETEX-encoded certs; see bug
2102191.