OSDN Git Service
Andy McFadden [Thu, 24 Sep 2009 21:52:54 +0000 (14:52 -0700)]
Fix gcc complaint.
Elliott Hughes [Tue, 22 Sep 2009 20:27:24 +0000 (13:27 -0700)]
Fix useDaylightTime for zh_TW (and other locales).
TimeZone.useDaylightTime shouldn't report whether a locale has *ever* used DST,
but whether a locale uses DST "these days". Taiwan is an example supported
locale that historically used DST but hasn't used it since 1980.
Bug: 877
Joshua Bloch [Tue, 22 Sep 2009 14:40:06 +0000 (07:40 -0700)]
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.)
Android (Google) Code Review [Tue, 22 Sep 2009 04:58:04 +0000 (00:58 -0400)]
Merge change 26288
* changes:
Cleaning up PipedInputStream.
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.)
Jesse Wilson [Mon, 21 Sep 2009 23:54:54 +0000 (16:54 -0700)]
Cleaning up PipedInputStream.
In particular, fixing a problem where the reader thread fails
as soon as the writer thread exists, even if there is data left
for the reader thread to read. Similarly, the writer fails fast
even when the buffer has space remaining.
Also fixing some concurrency issues by making readers and writers
release each other more aggressively.
Bob Lee [Tue, 22 Sep 2009 00:54:50 +0000 (17:54 -0700)]
am
158135f4: am
2317d8dd: Merge change 26055 into eclair
Merge commit '
158135f49f5372f24557d9d1e0917fd746acf6f2'
* commit '
158135f49f5372f24557d9d1e0917fd746acf6f2':
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.
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.
Android (Google) Code Review [Mon, 21 Sep 2009 23:03:28 +0000 (19:03 -0400)]
Merge change 26247
* changes:
Consistently use Formatter's cached NumberFormat.
David 'Digit' Turner [Mon, 21 Sep 2009 22:15:27 +0000 (15:15 -0700)]
am
baa78bce: am
bdfa9937: Merge change 25979 into eclair
Merge commit '
baa78bce6683560b4f9dca3b71e33d90d2d0cf29'
* commit '
baa78bce6683560b4f9dca3b71e33d90d2d0cf29':
Allow dalvik pre-optimization to run in ARMv7 emulator.
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).
Elliott Hughes [Mon, 21 Sep 2009 21:08:38 +0000 (14:08 -0700)]
Consistently use Formatter's cached NumberFormat.
%f is a lot more expensive than it should be because we're not using the cached
NumberFormat (as we are for %d). Running the microbenchmark I added to the
bug (times in ms, on a Cortex A8):
old new
new Formatter %f 1732 811
String.format %d 635 651
String.format %f 1752 900
reuse Formatter %f 1521 188
Double.toString + 149 148
Double.toString append 33 33
StringBuilder.append 143 139
Bug: 1476
Android (Google) Code Review [Mon, 21 Sep 2009 16:27:42 +0000 (12:27 -0400)]
Merge change 25926
* changes:
Manual merge of eclair change I26548922 into master.
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.
Jesse Wilson [Sun, 20 Sep 2009 19:58:33 +0000 (12:58 -0700)]
Adding checks for already-closed ZIP files.
See bug
1635955.
Lorenzo Colitti [Sat, 19 Sep 2009 18:06:31 +0000 (11:06 -0700)]
Manual merge of eclair change I26548922 into
Andy McFadden [Sat, 19 Sep 2009 01:16:46 +0000 (18:16 -0700)]
am
0f117a58: am
c7659ec1: Various minor changes to Dalvik documentation.
Merge commit '
0f117a580d22e6f68a6fb821e6cbc8c67389e8de'
* commit '
0f117a580d22e6f68a6fb821e6cbc8c67389e8de':
Various minor changes to Dalvik documentation.
Lorenzo Colitti [Sat, 19 Sep 2009 01:04:16 +0000 (18:04 -0700)]
Merge commit '
fc8ccda5' into manualmerge
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:32:57 +0000 (12:32 -0700)]
am
52176e28: am
8aad9a92: Merge change 24897 into eclair
Merge commit '
52176e2898f94f874d3f1ca62d70d6878ef62532'
* commit '
52176e2898f94f874d3f1ca62d70d6878ef62532':
First cut at a tool to perform automated syncs from Harmony to Dalvik.
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.
Jesse Wilson [Fri, 18 Sep 2009 19:18:25 +0000 (12:18 -0700)]
am
40e5e99e: am
7f331f3e: Fixing available() and close() for archive streams.
Merge commit '
40e5e99e5d19b9f2ff4cd26deeb141bc3d7f9df9'
* commit '
40e5e99e5d19b9f2ff4cd26deeb141bc3d7f9df9':
Fixing available() and close() for archive streams.
Wei Huang [Fri, 18 Sep 2009 19:18:21 +0000 (12:18 -0700)]
am
518c44cb: am
eea407c0: Merge change 25361 into eclair
Merge commit '
518c44cb3e250e7b8dc91ad4b3c03a970a84793b'
* commit '
518c44cb3e250e7b8dc91ad4b3c03a970a84793b':
modify gclog to take a procFilter argument, as well as the debug argument
Jesse Wilson [Fri, 18 Sep 2009 19:18:16 +0000 (12:18 -0700)]
am
17e591c5: am
df60455b: Merge change 25126 into eclair
Merge commit '
17e591c55554fc291fb8bd8a00bfdff0d6e46d11'
* commit '
17e591c55554fc291fb8bd8a00bfdff0d6e46d11':
Update archive to the r802921 from Harmony.
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.
Elliott Hughes [Fri, 18 Sep 2009 01:32:07 +0000 (18:32 -0700)]
Fix heap corruption in nio select(2) code.
The active ingredient in this change is that we now test that the fd isn't -1,
used to represent an invalid fd. There's a race condition where a socket can be
closed between SelectorImpl.prepareChannels and the native code. This caused us
to write to the -1th element of a heap-allocated structure, leading to SIGSEGV.
I've also removed the check for an empty fd_set. It was broken before and will
never have fired, but I don't think it makes sense to fix it, given this race
condition.
The race can't be fixed because the implementation is documented to close the
socket channel and *then* cancel the selection key.
This patch also removes various dead functions and tidies up timeval usage.
Bug:
2093094
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.
Android (Google) Code Review [Thu, 17 Sep 2009 19:39:31 +0000 (15:39 -0400)]
Merge change 25532
* changes:
Don't throw OutOfMemoryError if it's already been thrown.
Elliott Hughes [Thu, 17 Sep 2009 18:33:21 +0000 (11:33 -0700)]
Don't throw OutOfMemoryError if it's already been thrown.
If GetPrimitiveArrayCritical fails, it throws a suitable exception for us.
Also remove dead code.
Lorenzo Colitti [Thu, 17 Sep 2009 16:56:08 +0000 (09:56 -0700)]
am
120051b4: 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 '
120051b4744da2888756d901f9351ebd8e5ae467'
* commit '
120051b4744da2888756d901f9351ebd8e5ae467':
Report the cause of name lookup failures to Java land. The Java code already
Lorenzo Colitti [Thu, 17 Sep 2009 16:48:04 +0000 (09:48 -0700)]
am
a28e7d1a: am
1cf3dbce: Merge change 25160 into eclair
Merge commit '
a28e7d1a32d3883b5b279f5ddc8473e6bcbf6760'
* commit '
a28e7d1a32d3883b5b279f5ddc8473e6bcbf6760':
Make getHostByAddr and getHostByName return the proper object type.
Elliott Hughes [Thu, 17 Sep 2009 16:48:00 +0000 (09:48 -0700)]
am
d9f8adbf: am
cb12fde6: Make Resources preloadable again.
Merge commit '
d9f8adbfa912c24fb29d2a7e2ce7421a3f96ef82'
* commit '
d9f8adbfa912c24fb29d2a7e2ce7421a3f96ef82':
Make Resources$DefaultTimeZones preloadable again.
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.
Urs Grob [Thu, 17 Sep 2009 12:27:58 +0000 (05:27 -0700)]
am
880e713e: am
e937b1b2: Merge change 24110 into eclair
Merge commit '
880e713e4811ab933571e722f5d84354baf42bae'
* commit '
880e713e4811ab933571e722f5d84354baf42bae':
JarFile was not able to verify signed files with size 0.
Jean-Baptiste Queru [Thu, 17 Sep 2009 12:26:40 +0000 (05:26 -0700)]
am
92f4f58d: merge from open-source master
Merge commit '
92f4f58df944fd10c77e3d39d200c38c1491a941'
* commit '
92f4f58df944fd10c77e3d39d200c38c1491a941':
Typo fix in javadoc
Cosmetic change: cst -> type in javadoc @param
San Mehat [Thu, 17 Sep 2009 01:19:52 +0000 (18:19 -0700)]
am
49f91878: am
da03242f: Merge change 24840 into eclair
Merge commit '
49f9187825d898e1b696449a0162fa8a616e0ba0'
* commit '
49f9187825d898e1b696449a0162fa8a616e0ba0':
dalvik: Switch to common cutils sched_policy api
Jesse Wilson [Thu, 17 Sep 2009 01:18:04 +0000 (18:18 -0700)]
am
3c9692c5: am
2d34a33a: Merge change 23348 into eclair
Merge commit '
3c9692c5fa8b5232ceeafe0a3067c8bdbbf2f77a'
* commit '
3c9692c5fa8b5232ceeafe0a3067c8bdbbf2f77a':
Update crypto package to Harmony r802921. Only Javadoc changes.
Jesse Wilson [Thu, 17 Sep 2009 01:01:52 +0000 (18:01 -0700)]
am
cc4c69bc: am
023a932a: Merge change 24788 into eclair
Merge commit '
cc4c69bc91a8813e654095acf13e80a4d478eb24'
* commit '
cc4c69bc91a8813e654095acf13e80a4d478eb24':
Fixing the delimiter for the HTTP "Accept" header to be well-formed.
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
Bob Lee [Wed, 16 Sep 2009 17:23:01 +0000 (10:23 -0700)]
resolved conflicts for merge of
3eae287e to master
Android (Google) Code Review [Wed, 16 Sep 2009 14:22:29 +0000 (10:22 -0400)]
Merge change 25222
* changes:
Speling.
Android (Google) Code Review [Wed, 16 Sep 2009 14:21:54 +0000 (10:21 -0400)]
Merge change 25156
* changes:
Phantom fun.
Andy McFadden [Wed, 16 Sep 2009 03:01:40 +0000 (20:01 -0700)]
Speling.
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.
Android (Google) Code Review [Tue, 15 Sep 2009 20:41:13 +0000 (16:41 -0400)]
Merge change 24794
* changes:
Fix the final [mis]uses of iscopy.
Elliott Hughes [Fri, 11 Sep 2009 23:26:04 +0000 (16:26 -0700)]
Fix the final [mis]uses of iscopy.
I finally got round to going through all the dalvik/libcore/ calls to the
following routines, in cases where the final argument ("iscopy") is non-NULL:
Get*ArrayElements
GetStringChars
GetStringUTFChars
GetStringCritical
Get*ArrayCritical
The calls in sqlite_jni.c were neither assuming that setting "iscopy" requests
a copy (a bug we've seen elsewhere), nor were they making use of the result.
I've changed these to pass NULL to make their lack of interest explicit. I've
also fixed a compiler warning (signed/unsigned comparison).
The ones in org_apache_harmony_luni_platform_OSFileSystem.cpp were genuine
errors. The author was under the misapprehension that iscopy == JNI_FALSE
implies that you do not need to call the corresponding "Release" function.
I've fixed those. (I haven't addressed the fact that readvImpl and writevImpl
differ by just one token, nor have I addressed the fact that -- in theory
though not with our current GC -- any of the GetIntArrayElements could fail.)
Raphael [Tue, 15 Sep 2009 20:19:12 +0000 (13:19 -0700)]
am
7962ad6a: am
00c464ff: Merge change 24751 into eclair
Merge commit '
7962ad6a3154d86026a17be952295bdec64f1118'
* commit '
7962ad6a3154d86026a17be952295bdec64f1118':
Windows SDK: add support for -J option to dx.bat
Lorenzo Colitti [Tue, 15 Sep 2009 20:16:54 +0000 (13:16 -0700)]
am
60195db6: am
9ccfb95e: Merge change 24723 into eclair
Merge commit '
60195db609e4f5125e39348651d7a06ff807cc96'
* commit '
60195db609e4f5125e39348651d7a06ff807cc96':
Remove code duplication in InetAddress.getByAddress.
Lorenzo Colitti [Tue, 15 Sep 2009 20:16:16 +0000 (13:16 -0700)]
am
08211fc1: am
1e49340a: Merge change 24320 into eclair
Merge commit '
08211fc192db0bd48e78103678a902c32d67480d'
* commit '
08211fc192db0bd48e78103678a902c32d67480d':
Simplify networking code initialization using static structures instead of code.
Jesse Wilson [Tue, 15 Sep 2009 20:14:11 +0000 (13:14 -0700)]
am
21d20097: am
173086a3: Merge change 24620 into eclair
Merge commit '
21d20097e7a2015ac8fb55ff38e0242899b43936'
* commit '
21d20097e7a2015ac8fb55ff38e0242899b43936':
Fix cert code to use the String form for TELETEX-encoded certs; see bug
2102191.
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 22:30:14 +0000 (15:30 -0700)]
Update regex to Harmony r802921.
Notable changes:
- Reordered methods to be consistent with Harmony. Although our
implementations are significantly different, this will make
it easier to track Javadoc and signature changes.
- Some unchecked exceptions removed from method signatures
- Changed StringBuffer use to StringBuilder
- Changed PatternSyntaxException description field to 'desc' for
serialization compatibility.
commit
deba65caf92e9c5b77b29bcf9dcb26d637af90cb
Merge:
b239d4a 457c6cc
Author: Jesse Wilson <jessewilson@google.com>
Date: Wed Aug 12 09:23:58 2009 -0700
Merge branch 'regex_802921' into regex_dalvik
Conflicts:
libcore/regex/.classpath
libcore/regex/.settings/org.eclipse.jdt.core.prefs
libcore/regex/build.xml
libcore/regex/src/main/java/java/util/regex/AbstractCharClass.java
libcore/regex/src/main/java/java/util/regex/AbstractSet.java
libcore/regex/src/main/java/java/util/regex/CIDecomposedCharSet.java
libcore/regex/src/main/java/java/util/regex/CharClass.java
libcore/regex/src/main/java/java/util/regex/DecomposedCharSet.java
libcore/regex/src/main/java/java/util/regex/IntArrHash.java
libcore/regex/src/main/java/java/util/regex/JointSet.java
libcore/regex/src/main/java/java/util/regex/Lexer.java
libcore/regex/src/main/java/java/util/regex/MatchResult.java
libcore/regex/src/main/java/java/util/regex/Matcher.java
libcore/regex/src/main/java/java/util/regex/Pattern.java
libcore/regex/src/main/java/java/util/regex/PatternSyntaxException.java
libcore/regex/src/main/java/java/util/regex/SequenceSet.java
libcore/regex/src/main/java/java/util/regex/UCIDecomposedCharSet.java
libcore/regex/src/main/java/java/util/regex/UCISequenceSet.java
libcore/regex/src/main/java/org/apache/harmony/regex/internal/nls/messages.properties
libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Matcher2Test.java
libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/MatcherTest.java
libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ModeTest.java
libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/Pattern2Test.java
libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternErrorTest.java
libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternSyntaxExceptionTest.java
libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/PatternTest.java
libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/ReplaceTest.java
libcore/regex/src/test/java/org/apache/harmony/tests/java/util/regex/SplitTest.java
commit
b239d4a17905f9e0b609eeaa12de9dfba433c44a
Author: Jesse Wilson <jessewilson@google.com>
Date: Wed Aug 12 08:37:21 2009 -0700
Dalvik Regex
commit
457c6cca0629f20b118cd128353439763e40fe9e
Author: Jesse Wilson <jessewilson@google.com>
Date: Wed Aug 12 08:36:40 2009 -0700
Regex 802921
commit
51f4e67d71a8f92d8efa073fab32c540f6015594
Author: Jesse Wilson <jessewilson@google.com>
Date: Wed Aug 12 08:34:57 2009 -0700
Regex 527399
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.
Android (Google) Code Review [Mon, 14 Sep 2009 20:23:36 +0000 (16:23 -0400)]
Merge change 24714
* changes:
Remove duplicate copies of ICU error translation.
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.
Carl Shapiro [Fri, 11 Sep 2009 23:30:01 +0000 (16:30 -0700)]
Remove unused WITH_OBJECT_HEADERS code.
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
Ben Cheng [Fri, 11 Sep 2009 22:34:19 +0000 (15:34 -0700)]
Correct a typo in THUMB opcode name.
Android (Google) Code Review [Fri, 11 Sep 2009 22:05:07 +0000 (18:05 -0400)]
Merge change 24758
* changes:
Model resource usage for each Thumb/Thumb2 instrution.
Android (Google) Code Review [Fri, 11 Sep 2009 21:52:22 +0000 (17:52 -0400)]
Merge change 24759
* changes:
Comment out debugging output.
Ben Cheng [Fri, 11 Sep 2009 20:42:05 +0000 (13:42 -0700)]
Model resource usage for each Thumb/Thumb2 instrution.
This is an mid-point checkin to avoid future merge nightmare for the register
allocator work.
Android (Google) Code Review [Fri, 11 Sep 2009 21:13:51 +0000 (17:13 -0400)]
Merge change 24610
* changes:
Several small native code fixes.
Elliott Hughes [Fri, 11 Sep 2009 21:10:07 +0000 (14:10 -0700)]
Comment out debugging output.
The other two copies of this code have this line commented out, and I assume
it's only active here by accident.
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