OSDN Git Service
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.
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
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.
Android (Google) Code Review [Fri, 11 Sep 2009 17:51:13 +0000 (13:51 -0400)]
Merge change 24620 into eclair
* changes:
Fix cert code to use the String form for TELETEX-encoded certs; see bug
2102191.
Jesse Wilson [Fri, 11 Sep 2009 00:15:47 +0000 (17:15 -0700)]
Fix cert code to use the String form for TELETEX-encoded certs; see bug
2102191.
Lorenzo Colitti [Wed, 9 Sep 2009 01:30:56 +0000 (18:30 -0700)]
Simplify networking code initialization using static structures instead of code.
Fix an uninitialized variable.
Change-Id: Id9064a185525bfe072b244ea3d2acb56e5e185cd
San Mehat [Thu, 10 Sep 2009 23:12:09 +0000 (16:12 -0700)]
am
20677ed1: dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug
Merge commit '
20677ed1a7114a2aa51086d5097f6328cd4fb94d' into eclair-plus-aosp
* commit '
20677ed1a7114a2aa51086d5097f6328cd4fb94d':
dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug
San Mehat [Thu, 10 Sep 2009 16:30:03 +0000 (09:30 -0700)]
dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug
Signed-off-by: San Mehat <san@google.com>
San Mehat [Thu, 10 Sep 2009 15:29:58 +0000 (08:29 -0700)]
am
03c7547c: Merge change 24425 into eclair
Merge commit '
03c7547c40e6fc5b29b929b64f114e2dd3894e8e' into eclair-plus-aosp
* commit '
03c7547c40e6fc5b29b929b64f114e2dd3894e8e':
vm: Add support for using scheduler policies instead of cgroups
Android (Google) Code Review [Thu, 10 Sep 2009 15:24:16 +0000 (11:24 -0400)]
Merge change 24425 into eclair
* changes:
vm: Add support for using scheduler policies instead of cgroups
San Mehat [Wed, 9 Sep 2009 03:29:15 +0000 (20:29 -0700)]
vm: Add support for using scheduler policies instead of cgroups
Signed-off-by: San Mehat <san@google.com>
Ben Cheng [Wed, 9 Sep 2009 22:47:09 +0000 (15:47 -0700)]
am
500464de: DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.
Merge commit '
500464deb29dc8bfc7b5e51ab0fdffa6fa51b5d7' into eclair-plus-aosp
* commit '
500464deb29dc8bfc7b5e51ab0fdffa6fa51b5d7':
DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.
Ben Cheng [Wed, 9 Sep 2009 21:14:28 +0000 (14:14 -0700)]
DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.
Android Code Review [Wed, 9 Sep 2009 20:36:46 +0000 (13:36 -0700)]
Merge change 11462
* changes:
Typo fix in javadoc
Android Code Review [Wed, 9 Sep 2009 20:32:58 +0000 (13:32 -0700)]
Merge change 11461
* changes:
Cosmetic change: cst -> type in javadoc @param
Urs Grob [Tue, 8 Sep 2009 20:38:03 +0000 (13:38 -0700)]
am
7f5e6aa1: Merge change 23896 into eclair
Merge commit '
7f5e6aa1503d13300c277225bf4eea9e5a11495a' into eclair-plus-aosp
* commit '
7f5e6aa1503d13300c277225bf4eea9e5a11495a':
InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary
Bob Lee [Tue, 8 Sep 2009 20:38:00 +0000 (13:38 -0700)]
am
9dc72a3c: Modified Thread.c to allow sampling profiler thread in zygote. Added a function that queries the native thread status. Modified the profiler to sample every thread at a fixed interval instead of adjusting the delay based on the number of threads. This wil
Merge commit '
9dc72a3c54af7201b6b85d96dba23a5f85309d9b' into eclair-plus-aosp
* commit '
9dc72a3c54af7201b6b85d96dba23a5f85309d9b':
Modified Thread.c to allow sampling profiler thread in zygote. Added a function that
Urs Grob [Mon, 7 Sep 2009 14:34:47 +0000 (16:34 +0200)]
JarFile was not able to verify signed files with size 0.
This regressen was introduced by harmony optimizations done in HARMONY-4569.
This fix allows for jar entries of size 0 to also get successfully validated.
A regression test has been added to JarFileTest.
Android (Google) Code Review [Mon, 7 Sep 2009 07:52:55 +0000 (00:52 -0700)]
Merge change 23896 into eclair
* changes:
InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary
Bob Lee [Sat, 5 Sep 2009 01:28:16 +0000 (18:28 -0700)]
Modified Thread.c to allow sampling profiler thread in zygote. Added a function that
queries the native thread status. Modified the profiler to sample every thread at
a fixed interval instead of adjusting the delay based on the number of threads. This
will make it easier to compare results across apps. Added ability to shut down
the profiler thread. Added code to track whether the method was a leaf or a
caller.
Lorenzo Colitti [Fri, 4 Sep 2009 20:50:33 +0000 (13:50 -0700)]
am
f2f6f8b8: Document that createSocketFileDescriptor throws an exception on failure.
Merge commit '
f2f6f8b8d47733be0f291612730690b5ce379257' into eclair-plus-aosp
* commit '
f2f6f8b8d47733be0f291612730690b5ce379257':
Document that createSocketFileDescriptor throws an exception on failure.
Lorenzo Colitti [Fri, 4 Sep 2009 20:35:10 +0000 (13:35 -0700)]
Document that createSocketFileDescriptor throws an exception on failure.
Change-Id: Ic002b4dc8c40d798316afbab7a14bd81593e2541
Lorenzo Colitti [Fri, 4 Sep 2009 19:09:40 +0000 (12:09 -0700)]
am
3a4e4249: Merge change 23983 into eclair
Merge commit '
3a4e4249032009b175ba6a3d0bcc682f97e5e650' into eclair-plus-aosp
* commit '
3a4e4249032009b175ba6a3d0bcc682f97e5e650':
If an error occurs when creating a socket, don't call any more JNI methods
Android (Google) Code Review [Fri, 4 Sep 2009 19:08:18 +0000 (12:08 -0700)]
Merge change 23983 into eclair
* changes:
If an error occurs when creating a socket, don't call any more JNI methods (thus causing a segfault) but return immediately.
Lorenzo Colitti [Fri, 4 Sep 2009 18:59:12 +0000 (11:59 -0700)]
If an error occurs when creating a socket, don't call any more JNI methods
(thus causing a segfault) but return immediately.
Change-Id: I7d05997e38e631200542f85eba16b854d488d584
Lorenzo Colitti [Fri, 4 Sep 2009 17:51:19 +0000 (10:51 -0700)]
am
09302d63: Merge change 23572 into eclair
Merge commit '
09302d631adbdc36edd3ec961149b8f0fe1931f1' into eclair-plus-aosp
* commit '
09302d631adbdc36edd3ec961149b8f0fe1931f1':
Do not check hash codes against golden values. Instead, spot check that they
Android (Google) Code Review [Fri, 4 Sep 2009 17:48:43 +0000 (10:48 -0700)]
Merge change 23572 into eclair
* changes:
Do not check hash codes against golden values. Instead, spot check that they differ for different addresses and obvious values (e.g., 0 or 1) that might be returned by buggy implementations.
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:50:42 +0000 (07:50 -0700)]
merge from open-source master
Urs Grob [Wed, 2 Sep 2009 14:27:56 +0000 (16:27 +0200)]
InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary
BUG=
2033986
Lorenzo Colitti [Fri, 4 Sep 2009 01:46:01 +0000 (18:46 -0700)]
am
02e04f8b: Merge change 22871 into eclair
Merge commit '
02e04f8b1e41ce341fd765a4f9086f4b2360cfd0' into eclair-plus-aosp
* commit '
02e04f8b1e41ce341fd765a4f9086f4b2360cfd0':
More InetAddress fixes.
Android (Google) Code Review [Fri, 4 Sep 2009 01:43:08 +0000 (18:43 -0700)]
Merge change 22871 into eclair
* changes:
More InetAddress fixes.
Lorenzo Colitti [Thu, 27 Aug 2009 01:41:06 +0000 (18:41 -0700)]
More InetAddress fixes.
1. Make sure getHostByAddrImpl actually throws UnknownHostException: set
NI_NAMEREQD when calling getnameinfo to ensure it will fail if the IP
address looked up does not have a name associated with it, and pass this
exception back to the Java code. That way, the UnknownHostException passed
back to the Java code has information on what went wrong.
2. Remove superfluous logging on reverse lookups in the C code.
Change-Id: Ie195ce1f12e7b43fbf75f494002804f9db68fd8c
Jesse Wilson [Fri, 4 Sep 2009 00:45:37 +0000 (17:45 -0700)]
am
365f9fbb: Merge change 23918 into eclair
Merge commit '
365f9fbb3e5444f046ee569f168a231c8106ec09' into eclair-plus-aosp
* commit '
365f9fbb3e5444f046ee569f168a231c8106ec09':
do not merge: Josh's optimized HashMap and Hashtable
Android (Google) Code Review [Fri, 4 Sep 2009 00:43:12 +0000 (17:43 -0700)]
Merge change 23918 into eclair
* changes:
do not merge: Josh's optimized HashMap and Hashtable
Jesse Wilson [Thu, 3 Sep 2009 20:16:01 +0000 (13:16 -0700)]
do not merge: Josh's optimized HashMap and Hashtable
This commit squashes two changes from master. The only
additional change is that I've added "implements Map<K, V>"
to the signature of HashMap, which is necessary until we
get Josh's Apicheck fix in the master branch.
commit
5483e8adebc09b7bc58eb568793868388c240116
Author: Joshua Bloch <jjb@google.com>
Date: Mon Aug 31 17:55:19 2009 -0700
Replaced existing Hashtable implementation with fast one.
commit
90dbc304086ba1f6f51ed0d0b3a7368cc0fd46cb
Author: Joshua Bloch <jjb@google.com>
Date: Thu Aug 20 17:34:39 2009 -0700
Replace existing HashMap and LinkedHashMap with faster versions.
Among other optimizations, the new versions do no division and
use a high-quality defensive hash function to minimize the odds
of poor key distribution among buckets. Third time's a charm.
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:12:45 +0000 (14:12 -0700)]
merge from donut
Elliott Hughes [Thu, 3 Sep 2009 21:04:54 +0000 (14:04 -0700)]
am
16866f9c: Merge change 23208 into eclair
Merge commit '
16866f9c1fcfe8b1d1103424ed901517ce60883a' into eclair-plus-aosp
* commit '
16866f9c1fcfe8b1d1103424ed901517ce60883a':
Fix Class.getConstructor("whatever", (Class[]) null).
Android (Google) Code Review [Thu, 3 Sep 2009 21:03:10 +0000 (14:03 -0700)]
Merge change 23208 into eclair
* changes:
Fix Class.getConstructor("whatever", (Class[]) null).
Elliott Hughes [Fri, 28 Aug 2009 22:54:30 +0000 (15:54 -0700)]
Fix Class.getConstructor("whatever", (Class[]) null).
The RI treats null parameterTypes the same as an empty array.
This behavior is specified for getMethod, but only implied for getConstructor.
This patch:
* Fixes getConstructor.
* Improves javadoc for Class methods taking "Class... parameterTypes".
* Adds tests for both getConstructor and getMethod (which was already correct).
* Removes a line of debugging output to System.out.
Bug:
1824973
Nagendra Modadugu [Thu, 3 Sep 2009 19:14:04 +0000 (12:14 -0700)]
am
74d65387: Update GlobalSign Root CA to one that expires in 2028.
Merge commit '
74d65387394ddf242ca01db4e4d88e6374c74ed4' into eclair-plus-aosp
* commit '
74d65387394ddf242ca01db4e4d88e6374c74ed4':
Update GlobalSign Root CA to one that expires in 2028.
Nagendra Modadugu [Thu, 3 Sep 2009 19:01:43 +0000 (12:01 -0700)]
Update GlobalSign Root CA to one that expires in 2028.
Nagendra Modadugu [Thu, 3 Sep 2009 18:14:53 +0000 (11:14 -0700)]
am
ce90979d: Merge change 23480 into eclair
Merge commit '
ce90979d06ae2e0832f3a11a7a4a0c0281de75df' into eclair-plus-aosp
* commit '
ce90979d06ae2e0832f3a11a7a4a0c0281de75df':
Add Entrust root and intermediate certs.
Android (Google) Code Review [Thu, 3 Sep 2009 18:12:12 +0000 (11:12 -0700)]
Merge change 23480 into eclair
* changes:
Add Entrust root and intermediate certs.
Elliott Hughes [Thu, 3 Sep 2009 17:42:09 +0000 (10:42 -0700)]
am
91191d3e: Merge change 22771 into eclair
Merge commit '
91191d3e208d3a7c25c03e40018729877f954926' into eclair-plus-aosp
* commit '
91191d3e208d3a7c25c03e40018729877f954926':
Don't mutate input in OSMemory.setIntArray/setShortArray.
Android (Google) Code Review [Thu, 3 Sep 2009 17:39:52 +0000 (10:39 -0700)]
Merge change 22771 into eclair
* changes:
Don't mutate input in OSMemory.setIntArray/setShortArray.
Andy McFadden [Thu, 3 Sep 2009 14:38:41 +0000 (07:38 -0700)]
am
4b8a5527: Merge change 23683 into eclair
Merge commit '
4b8a55273e4cdc9d17d5c0e4eef1384ceb20c571' into eclair-plus-aosp
* commit '
4b8a55273e4cdc9d17d5c0e4eef1384ceb20c571':
DO NOT MERGE: Fix implementation of Thread.isAlive
Android (Google) Code Review [Thu, 3 Sep 2009 14:35:35 +0000 (07:35 -0700)]
Merge change 23683 into eclair
* changes:
DO NOT MERGE: Fix implementation of Thread.isAlive
Marco Nelissen [Wed, 2 Sep 2009 23:49:59 +0000 (16:49 -0700)]
am
ed974e9e: Merge change 23724 into eclair
Merge commit '
ed974e9ea6220b363d2f093d1a2d4bf4b8f3c429' into eclair-plus-aosp
* commit '
ed974e9ea6220b363d2f093d1a2d4bf4b8f3c429':
Fix x86 call bridge
Android (Google) Code Review [Wed, 2 Sep 2009 23:47:51 +0000 (16:47 -0700)]
Merge change 23724 into eclair
* changes:
Fix x86 call bridge
Marco Nelissen [Wed, 2 Sep 2009 23:23:07 +0000 (16:23 -0700)]
Fix x86 call bridge
Lorenzo Colitti [Wed, 2 Sep 2009 22:16:40 +0000 (15:16 -0700)]
am
793f1423: Merge change 23675 into eclair
Merge commit '
793f142323c49818ad022a05cbfb931eefddae5b' into eclair-plus-aosp
* commit '
793f142323c49818ad022a05cbfb931eefddae5b':
Unbreak Dalvik VM initialization due to a native method that expects to be able
Android (Google) Code Review [Wed, 2 Sep 2009 22:14:38 +0000 (15:14 -0700)]
Merge change 23675 into eclair
* changes:
Unbreak Dalvik VM initialization due to a native method that expects to be able to call an InetAddress no-args constructor. This constructor was package-private and was recently removed. This method is horribly complex and should go away (it probably doesn't even work, due to it attempting to find a class known as "java/io/FielDescriptor"), but it needs to be fixed for now.
Lorenzo Colitti [Wed, 2 Sep 2009 20:52:54 +0000 (13:52 -0700)]
Unbreak Dalvik VM initialization due to a native method that expects to be able
to call an InetAddress no-args constructor. This constructor was package-private
and was recently removed. This method is horribly complex and should go away (it
probably doesn't even work, due to it attempting to find a class known as
"java/io/FielDescriptor"), but it needs to be fixed for now.
Change-Id: I56b1e0e07f4c97af82e0a4f14dfd2d8af16f6b82
Andy McFadden [Tue, 1 Sep 2009 19:20:13 +0000 (12:20 -0700)]
DO NOT MERGE: Fix implementation of Thread.isAlive
(Originally submitted to master, pulling over to eclair.)
The implementation of Thread.isAlive() was changed a couple of years ago
as part of the Harmony integration. The current version relies on the
thread's state value to determine its liveness, but the VM was
originally written to be like JamVM, which used GNU ClassPath, which
uses the vmThread field instead.
It looks like it's possible for Thread.join() to get stuck, though as
far as I know this hasn't happened.
We're essentially rolling back part of 27774-p9. For internal bug
1966734.
Also: ran --update on test 044.
Elliott Hughes [Wed, 2 Sep 2009 20:58:29 +0000 (13:58 -0700)]
am
c19d2a1d: Fix two calls to memset(3) whose arguments were reversed.
Merge commit '
c19d2a1d798d8626f196d878abcf23a14bee40af' into eclair-plus-aosp
* commit '
c19d2a1d798d8626f196d878abcf23a14bee40af':
Fix two calls to memset(3) whose arguments were reversed.
Elliott Hughes [Wed, 2 Sep 2009 20:37:17 +0000 (13:37 -0700)]
Fix two calls to memset(3) whose arguments were reversed.
External bug 3358 reported the libcore/x-net instance. Manual inspection
turned up another instance in vm, but nothing else in the dalvik package.
Tested by booting sapphire-eng and running the x-net tests.
Bug:
1999244
Elliott Hughes [Wed, 2 Sep 2009 19:38:55 +0000 (12:38 -0700)]
am
5ca29e14: Merge change 22629 into eclair
Merge commit '
5ca29e142032b6559824e4f7d526bbc037b90c93' into eclair-plus-aosp
* commit '
5ca29e142032b6559824e4f7d526bbc037b90c93':
Fix "whatever".split(".") behavior.
Android (Google) Code Review [Wed, 2 Sep 2009 18:53:49 +0000 (11:53 -0700)]
Merge change 22629 into eclair
* changes:
Fix "whatever".split(".") behavior.
Lorenzo Colitti [Wed, 2 Sep 2009 02:38:28 +0000 (19:38 -0700)]
Do not check hash codes against golden values. Instead, spot check that they
differ for different addresses and obvious values (e.g., 0 or 1) that might be
returned by buggy implementations.
Change-Id: I4c093ccc268c91fc256b4ba76e1243de2d27670d
Lorenzo Colitti [Tue, 1 Sep 2009 23:42:44 +0000 (16:42 -0700)]
am
94e11fc4: InetAddress refactoring.
Merge commit '
94e11fc41d9bb7648932a21be7fa895c2432f610' into eclair-plus-aosp
* commit '
94e11fc41d9bb7648932a21be7fa895c2432f610':
InetAddress refactoring.
Lorenzo Colitti [Tue, 25 Aug 2009 23:56:27 +0000 (16:56 -0700)]
InetAddress refactoring.
1. Refactor all protocol-specific methods from InetAddress into Inet[46]Address.
2. Move all protocol-specific constants from InetAddress into Inet[46]Address.
This change should have no effect on the stack's behaviour but makes it easy to
find parts of the code that still have dependencies on IPv4 so they can be
examined and fixed.
Change-Id: I70860ee04cf7c01bffaa35c8c64199f69d99826f
Nagendra Modadugu [Tue, 1 Sep 2009 19:49:04 +0000 (12:49 -0700)]
Add Entrust root and intermediate certs.
Jean-Baptiste Queru [Tue, 1 Sep 2009 17:08:49 +0000 (10:08 -0700)]
merge from open-source master
Jesse Wilson [Mon, 31 Aug 2009 22:37:14 +0000 (15:37 -0700)]
Update crypto package to Harmony r802921. Only Javadoc changes.
commit
d5d4307b5b9f37e6f66ab1273be1acd2a29177de
Merge:
2c2287b 1c60d7c
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon Aug 31 15:36:46 2009 -0700
Merge branch 'crypto_802921' into crypto_dalvik
Conflicts:
libcore/crypto/.classpath
libcore/crypto/build.xml
libcore/crypto/src/main/java/javax/crypto/BadPaddingException.java
libcore/crypto/src/main/java/javax/crypto/Cipher.java
libcore/crypto/src/main/java/javax/crypto/CipherInputStream.java
libcore/crypto/src/main/java/javax/crypto/CipherOutputStream.java
libcore/crypto/src/main/java/javax/crypto/CipherSpi.java
libcore/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
libcore/crypto/src/main/java/javax/crypto/ExemptionMechanism.java
libcore/crypto/src/main/java/javax/crypto/ExemptionMechanismException.java
libcore/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java
libcore/crypto/src/main/java/javax/crypto/IllegalBlockSizeException.java
libcore/crypto/src/main/java/javax/crypto/KeyAgreement.java
libcore/crypto/src/main/java/javax/crypto/KeyAgreementSpi.java
libcore/crypto/src/main/java/javax/crypto/KeyGenerator.java
libcore/crypto/src/main/java/javax/crypto/KeyGeneratorSpi.java
libcore/crypto/src/main/java/javax/crypto/Mac.java
libcore/crypto/src/main/java/javax/crypto/MacSpi.java
libcore/crypto/src/main/java/javax/crypto/NoSuchPaddingException.java
libcore/crypto/src/main/java/javax/crypto/NullCipher.java
libcore/crypto/src/main/java/javax/crypto/SealedObject.java
libcore/crypto/src/main/java/javax/crypto/SecretKey.java
libcore/crypto/src/main/java/javax/crypto/SecretKeyFactory.java
libcore/crypto/src/main/java/javax/crypto/SecretKeyFactorySpi.java
libcore/crypto/src/main/java/javax/crypto/ShortBufferException.java
libcore/crypto/src/main/java/javax/crypto/interfaces/DHKey.java
libcore/crypto/src/main/java/javax/crypto/interfaces/DHPrivateKey.java
libcore/crypto/src/main/java/javax/crypto/interfaces/DHPublicKey.java
libcore/crypto/src/main/java/javax/crypto/interfaces/PBEKey.java
libcore/crypto/src/main/java/javax/crypto/spec/DESKeySpec.java
libcore/crypto/src/main/java/javax/crypto/spec/DESedeKeySpec.java
libcore/crypto/src/main/java/javax/crypto/spec/DHGenParameterSpec.java
libcore/crypto/src/main/java/javax/crypto/spec/DHParameterSpec.java
libcore/crypto/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java
libcore/crypto/src/main/java/javax/crypto/spec/DHPublicKeySpec.java
libcore/crypto/src/main/java/javax/crypto/spec/IvParameterSpec.java
libcore/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
libcore/crypto/src/main/java/javax/crypto/spec/PBEKeySpec.java
libcore/crypto/src/main/java/javax/crypto/spec/PBEParameterSpec.java
libcore/crypto/src/main/java/javax/crypto/spec/PSource.java
libcore/crypto/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
libcore/crypto/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
libcore/crypto/src/main/java/javax/crypto/spec/SecretKeySpec.java
commit
2c2287b521cc5f558d9929e14e31ec92da6285b1
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon Aug 31 14:56:45 2009 -0700
crypto_dalvik
commit
1c60d7c222c55ae49add8345a192c54357bb4a1f
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon Aug 31 14:56:34 2009 -0700
crypto_802921
commit
50cf7f5d97de2f65ee0769aafec7b5a3551cb5d0
Author: Jesse Wilson <jessewilson@google.com>
Date: Mon Aug 31 14:56:27 2009 -0700
crypto_527399
Jesse Wilson [Mon, 31 Aug 2009 17:52:23 +0000 (10:52 -0700)]
Update prefs to Harmony r772995.
Notable changes:
- exception handling has changed to cleanup more reliably
- calls to Collection.toArray() size the array properly
- lots of style tweaks (rewrapping Javadoc, reintending wrapped code, whitespace)
- new PrefsTester class ensures tests store prefs in the tmp directory
Squashed commit of the following:
commit
2157269d8ed39ccb8a71d735c12bbabcfd548243
Merge:
d287282 97818bf
Author: Jesse Wilson <jessewilson@google.com>
Date: Wed Aug 5 11:14:26 2009 -0700
Merge branch 'prefs_772995' into prefs_dalvik
Conflicts:
libcore/prefs/.classpath
libcore/prefs/.settings/org.eclipse.jdt.core.prefs
libcore/prefs/build.xml
libcore/prefs/make/exclude.linux.x86_64.drl
libcore/prefs/make/exclude.windows.x86.drl
libcore/prefs/make/exclude.windows.x86_64.drl
libcore/prefs/src/main/java/java/util/prefs/AbstractPreferences.java
libcore/prefs/src/main/java/java/util/prefs/BackingStoreException.java
libcore/prefs/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
libcore/prefs/src/main/java/java/util/prefs/FilePreferencesImpl.java
libcore/prefs/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
libcore/prefs/src/main/java/java/util/prefs/NodeChangeEvent.java
libcore/prefs/src/main/java/java/util/prefs/NodeChangeListener.java
libcore/prefs/src/main/java/java/util/prefs/PreferenceChangeEvent.java
libcore/prefs/src/main/java/java/util/prefs/PreferenceChangeListener.java
libcore/prefs/src/main/java/java/util/prefs/Preferences.java
libcore/prefs/src/main/java/java/util/prefs/PreferencesFactory.java
libcore/prefs/src/main/java/java/util/prefs/RegistryPreferencesFactoryImpl.java
libcore/prefs/src/main/java/java/util/prefs/RegistryPreferencesImpl.java
libcore/prefs/src/main/java/java/util/prefs/XMLParser.java
libcore/prefs/src/main/java/org/apache/harmony/prefs/internal/nls/Messages.java
libcore/prefs/src/main/native/prefs/windows/PreferencesImpl.c
libcore/prefs/src/main/native/prefs/windows/hyprefs.rc
libcore/prefs/src/main/native/prefs/windows/makefile
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferencesFactory.java
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
libcore/prefs/src/test/java/tests/prefs/AllTests.java
commit
d287282b550d4a5d262f1d1703344ed61bdc6d15
Author: Jesse Wilson <jessewilson@google.com>
Date: Tue Aug 4 14:36:36 2009 -0700
Dalvik Prefs
commit
97818bf21cfde744eeb5fbf1f9c31d9bd66f5a2e
Author: Jesse Wilson <jessewilson@google.com>
Date: Tue Aug 4 14:35:52 2009 -0700
Prefs 772995
commit
9a506f93947938dad3b41e1393f53b766ba0319f
Author: Jesse Wilson <jessewilson@google.com>
Date: Tue Aug 4 14:22:40 2009 -0700
Prefs 527399