OSDN Git Service
Carl Shapiro [Fri, 11 Sep 2009 23:30:01 +0000 (16:30 -0700)]
Remove unused WITH_OBJECT_HEADERS code.
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.
Android (Google) Code Review [Fri, 11 Sep 2009 17:59:40 +0000 (13:59 -0400)]
Merge change 24634
* changes:
Remove NativeBN_bn2twosComp.
Elliott Hughes [Fri, 11 Sep 2009 01:24:33 +0000 (18:24 -0700)]
Remove NativeBN_bn2twosComp.
NativeBN_bn2twosComp doesn't do what it claims to: it's an exact copy of
NativeBN_BN_bn2bin (observe which OpenSSL BN_ function it calls!), and -- from
the OpenSSL documentation -- that function "converts the absolute value of [its
argument] into big-endian form".
OpenSSL doesn't actually sport any appropriate function to call here, but
luckily this code isn't called anywhere, and so can be removed.
(BigInteger.toByteArray -- the most likely caller of this code -- seems to
do the right thing, using Java code to make a big-endian two's-complement
byte[]. Likewise, the conversion from a big-endian two's-complement byte[]
for the corresponding BigInteger constructor looks right too, using native
code to twiddle the bits itself.)
Android (Google) Code Review [Thu, 10 Sep 2009 23:31:30 +0000 (19:31 -0400)]
Merge change 24595
* changes:
Display additional information on stack overflow.
San Mehat [Thu, 10 Sep 2009 23:21:48 +0000 (16:21 -0700)]
am
060ed889: am
20677ed1: dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug
Merge commit '
060ed88949321e193e95976c41e647cb46b9778b'
* commit '
060ed88949321e193e95976c41e647cb46b9778b':
dalvik: Use common SchedPolicy type and fix getpid() vs. gettid() bug
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
Elliott Hughes [Thu, 10 Sep 2009 23:09:29 +0000 (16:09 -0700)]
Several small native code fixes.
* Don't throw OutOfMemoryError manually in Adler32/CRC32: the VM does that for
us if GetPrimitiveArrayCritical needs, but fails, to allocate memory.
* Don't use anything but NULL for the "iscopy" argument to Get*ArrayElements.
The other users of this argument (removed earlier this week) were under the
mistaken impression that it's an "in" parameter rather than an "out" parameter,
and since these remaining callers aren't actually using the result, let's
remove the cruft.
* Move the null check in harmony_io_openImpl for "path" to come *before* the
first dereference.
* Make harmony_io_ttyReadImpl just delegate to harmony_io_readImpl since,
apart from the zero-length read check, they were identical.
* Remove the dead function throwIOExceptionStr from the OpenSSLSessionImpl
native code.
Tested on sapphire-eng.
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>
Andy McFadden [Thu, 10 Sep 2009 22:34:19 +0000 (15:34 -0700)]
Display additional information on stack overflow.
This required passing an additional argument into dvmHandleStackOverflow,
which is called directly from mterp. Fortunately the method being
called is sitting in a register for both ARM and x86, so this is a
fairly simple change.
For internal bug
2110533.
Android (Google) Code Review [Thu, 10 Sep 2009 20:40:01 +0000 (16:40 -0400)]
Merge change 24439
* changes:
Fix unnecessary GetPrimitiveArrayCritical users.
Android (Google) Code Review [Thu, 10 Sep 2009 20:33:23 +0000 (16:33 -0400)]
Merge change 24470
* changes:
Use GetStringRegion/GetStringUTFRegion where appropriate.
Android (Google) Code Review [Thu, 10 Sep 2009 17:34:00 +0000 (13:34 -0400)]
Merge change 24537
* changes:
Add support for profiling when loop optimizations are active
Elliott Hughes [Thu, 10 Sep 2009 01:15:23 +0000 (18:15 -0700)]
Use GetStringRegion/GetStringUTFRegion where appropriate.
Note that the changes to DecimalFormatInterface.cpp and RBNFInterface.cpp
are just minor tidy-ups, fixing an issue where the early error exit wouldn't
call ReleaseStringChars to undo the earlier call to GetStringChars. Also
remove a dead function and fix a comment in ExpatParser.cpp.
Tested on sapphire-eng.
Bug:
1639287
Bill Buzbee [Thu, 10 Sep 2009 17:10:38 +0000 (10:10 -0700)]
Add support for profiling when loop optimizations are active
San Mehat [Thu, 10 Sep 2009 16:24:13 +0000 (09:24 -0700)]
am
95934be3: am
03c7547c: Merge change 24425 into eclair
Merge commit '
95934be333d74ac48c19ae40a8207361a913516a'
* commit '
95934be333d74ac48c19ae40a8207361a913516a':
vm: Add support for using scheduler policies instead of cgroups
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 23:31:37 +0000 (16:31 -0700)]
am
2e7b31f3: (-s ours) am
500464de: DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.
Merge commit '
2e7b31f368be01437da025f2e12dc4dcbff46f5d'
* commit '
2e7b31f368be01437da025f2e12dc4dcbff46f5d':
DO NOT MERGE: Do not enable JIT_TUNING and assertion by default with JIT.
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.
Elliott Hughes [Wed, 9 Sep 2009 22:16:59 +0000 (15:16 -0700)]
Fix unnecessary GetPrimitiveArrayCritical users.
Tested on sapphire-eng.
Bug:
1639287
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 (Google) Code Review [Wed, 9 Sep 2009 20:54:08 +0000 (16:54 -0400)]
Merge change 24402
* changes:
Use GetByteArrayRegion instead of GetByteArrayElements.
Android (Google) Code Review [Wed, 9 Sep 2009 20:50:54 +0000 (16:50 -0400)]
Merge change 24309
* changes:
Use Get*ArrayRegion/Set*ArrayRegion instead of Get*ArrayElements.
Elliott Hughes [Wed, 9 Sep 2009 02:44:54 +0000 (19:44 -0700)]
Use Get*ArrayRegion/Set*ArrayRegion instead of Get*ArrayElements.
This fixes all instances in the networking code, but doesn't address similar
patterns, nor non-networking code. This seemed like a reasonably-sized
meaningful chunk. Tested on sapphire-eng.
Bug:
1639287
Elliott Hughes [Wed, 9 Sep 2009 19:02:08 +0000 (12:02 -0700)]
Use GetByteArrayRegion instead of GetByteArrayElements.
I've also cleaned up the two calls to free(3) in ubidi_close; the former had
an unnecessary NULL check, and the latter was indented as if it belonged to the
if (but didn't).
Tested on sapphire-eng.
Android (Google) Code Review [Wed, 9 Sep 2009 18:20:17 +0000 (14:20 -0400)]
Merge change 24308
* changes:
Remove @KnownFailure from a working test.
Urs Grob [Wed, 9 Sep 2009 17:55:56 +0000 (10:55 -0700)]
am
ad8efa12: am
7f5e6aa1: Merge change 23896 into eclair
Merge commit '
ad8efa123b7133895b9c198a84a32020869eba18'
* commit '
ad8efa123b7133895b9c198a84a32020869eba18':
InputStreamReader forgets to convert incomplete multibyte characters at the buffer boundary
Android Git Automerger [Wed, 9 Sep 2009 17:48:47 +0000 (10:48 -0700)]
resolved conflicts for merge of
9b5264c8 to master
Elliott Hughes [Wed, 9 Sep 2009 02:50:08 +0000 (19:50 -0700)]
Remove @KnownFailure from a working test.
The bug causing this test's known failure was fixed 2009-07-16.
Bug:
1481226
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
Elliott Hughes [Tue, 8 Sep 2009 20:19:16 +0000 (13:19 -0700)]
Add missing calls to ReleaseByteArrayElements.
Without this fix, the two new tests cause the VM to abort like this:
W/dalvikvm( 386): ReferenceTable overflow (max=1024)
W/dalvikvm( 386): Last 10 entries in JNI pinned array reference table:
W/dalvikvm( 386): 1014: 0x4038e018 cls=[B (1044 bytes)
W/dalvikvm( 386): 1015: 0x4038e430 cls=[B (1044 bytes)
W/dalvikvm( 386): 1016: 0x4038e848 cls=[B (1044 bytes)
W/dalvikvm( 386): 1017: 0x4038ec60 cls=[B (1044 bytes)
W/dalvikvm( 386): 1018: 0x4038f078 cls=[B (1044 bytes)
W/dalvikvm( 386): 1019: 0x4038f490 cls=[B (1044 bytes)
W/dalvikvm( 386): 1020: 0x4038f8a8 cls=[B (1044 bytes)
W/dalvikvm( 386): 1021: 0x4038fcc0 cls=[B (1044 bytes)
W/dalvikvm( 386): 1022: 0x403900d8 cls=[B (1044 bytes)
W/dalvikvm( 386): 1023: 0x403904f0 cls=[B (1044 bytes)
W/dalvikvm( 386): JNI pinned array reference table summary (1024 entries):
W/dalvikvm( 386): 1024 of [B 1044B (1024 unique)
W/dalvikvm( 386): Memory held directly by native code is
1069056 bytes
E/dalvikvm( 386): Failed adding to JNI pinned array ref table (1024 entries)
I/dalvikvm( 386): "main" prio=5 tid=3 RUNNABLE
I/dalvikvm( 386): | group="main" sCount=0 dsCount=0 s=N obj=0x4001e2b8 self=0xb488
I/dalvikvm( 386): | sysTid=386 nice=0 sched=0/0 cgrp=default handle=-
1344005452
I/dalvikvm( 386): at org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl.nativeinit(Native Method)
I/dalvikvm( 386): at org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl.init(OpenSSLSocketImpl.java:126)
I/dalvikvm( 386): at org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl.<init>(OpenSSLSocketImpl.java:158)
I/dalvikvm( 386): at org.apache.harmony.xnet.provider.jsse.OpenSSLSocketFactoryImpl.createSocket(OpenSSLSocketFactoryImpl.java:61)
I/dalvikvm( 386): at tests.api.javax.net.ssl.SSLSocketTest.test_creationStressTest(SSLSocketTest.java:359)
...
Tested on sapphire-eng.
No bug; found by inspection when investigating bug
1639287.
Android (Google) Code Review [Tue, 8 Sep 2009 17:33:34 +0000 (10:33 -0700)]
Merge change 24055
* changes:
Fix Package.isCompatibleWith.
Android (Google) Code Review [Tue, 8 Sep 2009 17:29:53 +0000 (10:29 -0700)]
Merge change 23734
* changes:
Updated expected outputs in dalvik benchmarks. Improved debugging output and added spin loop on detection of divergence in self verification tool.
Android (Google) Code Review [Tue, 8 Sep 2009 17:06:03 +0000 (10:06 -0700)]
Merge change 24036
* changes:
Reduce a log message, stifle a gcc warning.
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.
Elliott Hughes [Sat, 5 Sep 2009 01:14:24 +0000 (18:14 -0700)]
Fix Package.isCompatibleWith.
Note that this doesn't help us because to Dalvik, all packages have
version "0.0".
Bug:
2099697
Andy McFadden [Fri, 4 Sep 2009 22:38:13 +0000 (15:38 -0700)]
Reduce a log message, stifle a gcc warning.
Ben Cheng [Fri, 21 Aug 2009 23:18:46 +0000 (16:18 -0700)]
Updated expected outputs in dalvik benchmarks. Improved debugging output and added spin loop on detection of divergence in self verification tool.
Android (Google) Code Review [Fri, 4 Sep 2009 20:54:47 +0000 (13:54 -0700)]
Merge change 23992
* changes:
Inline Sqrt bug fix; add support for fp/gen register copies
Lorenzo Colitti [Fri, 4 Sep 2009 20:52:28 +0000 (13:52 -0700)]
am
ed216806: am
f2f6f8b8: Document that createSocketFileDescriptor throws an exception on failure.
Merge commit '
ed21680602783711c7dac9675ae65ad329a050c1'
* commit '
ed21680602783711c7dac9675ae65ad329a050c1':
Document that createSocketFileDescriptor throws an exception on failure.
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
Bill Buzbee [Mon, 31 Aug 2009 17:25:55 +0000 (10:25 -0700)]
Inline Sqrt bug fix; add support for fp/gen register copies
Lorenzo Colitti [Fri, 4 Sep 2009 19:11:27 +0000 (12:11 -0700)]
am
f751aeb1: am
3a4e4249: Merge change 23983 into eclair
Merge commit '
f751aeb179cd531df610689217f36e760bd25639'
* commit '
f751aeb179cd531df610689217f36e760bd25639':
If an error occurs when creating a socket, don't call any more JNI methods
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 18:07:25 +0000 (11:07 -0700)]
am
4fa89f9d: am
09302d63: Merge change 23572 into eclair
Merge commit '
4fa89f9d9af93f9d3b9125430160818f456aed5a'
* commit '
4fa89f9d9af93f9d3b9125430160818f456aed5a':
Do not check hash codes against golden values. Instead, spot check that they
Jean-Baptiste Queru [Fri, 4 Sep 2009 18:05:46 +0000 (11:05 -0700)]
Lorenzo Colitti [Fri, 4 Sep 2009 18:04:56 +0000 (11:04 -0700)]
Jesse Wilson [Fri, 4 Sep 2009 18:04:47 +0000 (11:04 -0700)]
am
5765fb64: (-s ours) am
365f9fbb: Merge change 23918 into eclair
Merge commit '
5765fb64620d955a0bcadd14cb35f9a95df69072'
* commit '
5765fb64620d955a0bcadd14cb35f9a95df69072':
do not merge: Josh's optimized HashMap and Hashtable
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.
Ben Cheng [Thu, 3 Sep 2009 21:40:16 +0000 (14:40 -0700)]
Various bug fixes for armv5 and loop/self-verification co-existence.
Fixed the out-of-bound problem for RegImm compares when imm cannot be encoded.
Renamed insertRegRegCheck to genRegRegCheck to be consistent with other code.
Fixed the loop formation code to break out of the tight loop in each iteration
when self-verification is enabled.
Android (Google) Code Review [Thu, 3 Sep 2009 21:57:57 +0000 (14:57 -0700)]
Merge change 23876
* changes:
Update the JIT to use the new indexAt() inline native routines.
Android (Google) Code Review [Thu, 3 Sep 2009 21:50:18 +0000 (14:50 -0700)]
Merge change 23891
* changes:
Minor fix.
Andy McFadden [Thu, 3 Sep 2009 21:48:10 +0000 (14:48 -0700)]
Minor fix.
Added a couple of allocation failure checks. For
1332727.
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:12:45 +0000 (14:12 -0700)]
merge from donut
Elliott Hughes [Thu, 3 Sep 2009 21:07:08 +0000 (14:07 -0700)]
am
01d30203: am
16866f9c: Merge change 23208 into eclair
Merge commit '
01d30203b6dc48ed648778f8c93767ed65fe2ac4'
* commit '
01d30203b6dc48ed648778f8c93767ed65fe2ac4':
Fix Class.getConstructor("whatever", (Class[]) null).
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).
Bill Buzbee [Thu, 3 Sep 2009 21:03:09 +0000 (14:03 -0700)]
Update the JIT to use the new indexAt() inline native routines.
Android (Google) Code Review [Thu, 3 Sep 2009 20:21:16 +0000 (13:21 -0700)]
Merge change 23857
* changes:
Add inline version of String.indexOf().
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
Andy McFadden [Thu, 3 Sep 2009 01:07:23 +0000 (18:07 -0700)]
Add inline version of String.indexOf().
This provides an inline-native version of String.indexOf(int) and
String.indexOf(int, int), i.e. the functions that work like strchr().
Has a fairly solid impact on specific benchmarks. Might give a boost to
an app somewhere.
Added some indexOf tests to 020-string.
Added hard-coded field offsets for String. These are verified during
startup. Improves some of our String micro-benchmarks by ~10%.
Nagendra Modadugu [Thu, 3 Sep 2009 19:15:36 +0000 (12:15 -0700)]
am
0cc58014: am
74d65387: Update GlobalSign Root CA to one that expires in 2028.
Merge commit '
0cc580141a3139d80ef683c197158d1ebb7b8ccc'
* commit '
0cc580141a3139d80ef683c197158d1ebb7b8ccc':
Update GlobalSign Root CA to one that expires in 2028.
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:18:41 +0000 (11:18 -0700)]
am
7fe78291: am
ce90979d: Merge change 23480 into eclair
Merge commit '
7fe782915199f03ec8e7484d2db35c9cb948770c'
* commit '
7fe782915199f03ec8e7484d2db35c9cb948770c':
Add Entrust root and intermediate certs.
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:44:43 +0000 (10:44 -0700)]
am
df836c58: am
91191d3e: Merge change 22771 into eclair
Merge commit '
df836c58934fd1f7ec4d7de57cd1c053399f89bb'
* commit '
df836c58934fd1f7ec4d7de57cd1c053399f89bb':
Don't mutate input in OSMemory.setIntArray/setShortArray.
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 16:52:28 +0000 (09:52 -0700)]
am
2df5f5af: (-s ours) am
4b8a5527: Merge change 23683 into eclair
Merge commit '
2df5f5af614570c109403b0f912faf71868f204a'
* commit '
2df5f5af614570c109403b0f912faf71868f204a':
DO NOT MERGE: Fix implementation of Thread.isAlive
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:53:09 +0000 (16:53 -0700)]
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
Android (Google) Code Review [Wed, 2 Sep 2009 22:40:59 +0000 (15:40 -0700)]
Merge change 23384
* changes:
Replaced existing Hashtable implementation with fast one.
Lorenzo Colitti [Wed, 2 Sep 2009 22:18:59 +0000 (15:18 -0700)]
am
304fcb28: am
793f1423: Merge change 23675 into eclair
Merge commit '
304fcb28d7b63219e9d52423d08a41b4f6be5df1'
* commit '
304fcb28d7b63219e9d52423d08a41b4f6be5df1':
Unbreak Dalvik VM initialization due to a native method that expects to be able