OSDN Git Service
Joe Onorato [Thu, 15 Jul 2010 18:12:43 +0000 (11:12 -0700)]
am
0f0e6f10: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '
0f0e6f10f9029a958683b0830d47b21bc993a067' into gingerbread-plus-aosp
* commit '
0f0e6f10f9029a958683b0830d47b21bc993a067':
The ICU data is no longer compiled directly into the shared library.
Joe Onorato [Thu, 15 Jul 2010 18:08:00 +0000 (11:08 -0700)]
Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
The Android Open Source Project [Wed, 14 Jul 2010 18:32:04 +0000 (11:32 -0700)]
am
3f4f8ad0: am
98c2591a: (-s ours) merge from open-source froyo
Merge commit '
3f4f8ad0ff9a603419b66d6672cc00bb69b35d78' into gingerbread-plus-aosp
* commit '
3f4f8ad0ff9a603419b66d6672cc00bb69b35d78':
Add/Remove Some @KnownFailure Annotations
The Android Open Source Project [Wed, 14 Jul 2010 18:29:03 +0000 (11:29 -0700)]
am
98c2591a: (-s ours) merge from open-source froyo
Merge commit '
98c2591a3de16682c957edc0d4fd3d10aacb3cb9' into gingerbread
* commit '
98c2591a3de16682c957edc0d4fd3d10aacb3cb9':
Add/Remove Some @KnownFailure Annotations
Joe Onorato [Wed, 14 Jul 2010 02:08:08 +0000 (19:08 -0700)]
The ICU data is no longer compiled directly into the shared library.
Change-Id: Ief1aa1c5f6da39f4d94cb68b285d8e02cc10b9ac
The Android Open Source Project [Tue, 13 Jul 2010 22:27:19 +0000 (15:27 -0700)]
merge from open-source froyo
Change-Id: Ia703f40fe40ea86791db8090dc821f2ab0ffdd4d
Brian Muramatsu [Mon, 12 Jul 2010 22:17:47 +0000 (15:17 -0700)]
Add/Remove Some @KnownFailure Annotations
Bug
2639444 2564250 2639393
Remove the @KnownFailure annotations form tests now passing in
Froyo for Nexus One using the CTS test runner. Put on
@KnownFailure annotations for those that are failing but passing
with the run-core-tests test runner.
MultiSocketTest is an exception that doesn't seem to make sense,
and fails in both runners.
Change-Id: Id8eb6b5d6f2b04b77434411f2b04c56cd61acf85
Bill Buzbee [Fri, 9 Jul 2010 19:39:36 +0000 (12:39 -0700)]
am
856d111c: am
b6d37288: JIT: Fix for
2813841, use core regs for sub-word data
Merge commit '
856d111c4c87e4b47c71954dc6548e636295ea50' into gingerbread-plus-aosp
* commit '
856d111c4c87e4b47c71954dc6548e636295ea50':
JIT: Fix for
2813841, use core regs for sub-word data
Bill Buzbee [Fri, 9 Jul 2010 19:37:59 +0000 (12:37 -0700)]
am
b6d37288: JIT: Fix for
2813841, use core regs for sub-word data
Merge commit '
b6d372886d145716f1f62d39726ea06255ebe76d' into gingerbread
* commit '
b6d372886d145716f1f62d39726ea06255ebe76d':
JIT: Fix for
2813841, use core regs for sub-word data
Bill Buzbee [Wed, 7 Jul 2010 13:55:56 +0000 (06:55 -0700)]
JIT: Fix for
2813841, use core regs for sub-word data
In an attempt to avoid unnecessary register copies, the JIT allows
data items to live in either floating point or core registers until
an instruction is used which requires one or the other. The bug here
was that sub-word data was allowed to live in floating point registers
at the point of a load or store. This cl forces the use of core registers
in those cases.
Change-Id: Iaee57545c6a62990186a5d0ab5bb22728d75dd60
The Android Open Source Project [Thu, 1 Jul 2010 17:37:36 +0000 (10:37 -0700)]
merge from open-source master
Change-Id: I3534c806a396de3365ef7278a9c4799f7f95e0e7
Bruce Beare [Fri, 25 Jun 2010 16:53:56 +0000 (09:53 -0700)]
Don't prelink dalvik for x86
x86 doesn't (yet) support pre-linking and we need to disable it until it does.
Change-Id: Icfba41c364ed934632386e2fa7f50844dabd126e
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Bill Buzbee [Wed, 30 Jun 2010 22:33:19 +0000 (15:33 -0700)]
am
79d2a00a: am
6296a2e8: Jit: Fix for
2793725 SIGSEGV in JIT code cache
Merge commit '
79d2a00ab79b07f4a69035f9f7fb922fd0552122' into gingerbread-plus-aosp
* commit '
79d2a00ab79b07f4a69035f9f7fb922fd0552122':
Jit: Fix for
2793725 SIGSEGV in JIT code cache
Bill Buzbee [Wed, 30 Jun 2010 19:08:06 +0000 (12:08 -0700)]
am
6296a2e8: Jit: Fix for
2793725 SIGSEGV in JIT code cache
Merge commit '
6296a2e8e97d76165a83320b06e32fba0f5a5625' into gingerbread
* commit '
6296a2e8e97d76165a83320b06e32fba0f5a5625':
Jit: Fix for
2793725 SIGSEGV in JIT code cache
Bill Buzbee [Wed, 23 Jun 2010 23:36:50 +0000 (16:36 -0700)]
Jit: Fix for
2793725 SIGSEGV in JIT code cache
r7 and r8 were missing from the handler clobber set, and are stepped on by
the handlers for inline string compareto and indexof.
Change-Id: I979c4b94ee412cb3d2ab76c2421f4c2336d9b6e3
The Android Open Source Project [Fri, 25 Jun 2010 16:42:59 +0000 (09:42 -0700)]
merge from froyo-plus-aosp
Change-Id: If7ea7cb45a74560ef46f771e25b75a1c03417f27
Dan Bornstein [Fri, 25 Jun 2010 01:31:03 +0000 (18:31 -0700)]
am
74826481: Merge "Updated the warning about old-style inner class metadata to reflect the current understanding of the situation." into gingerbread
Merge commit '
7482648141995c52f5e3aeddb3b44092923cb33a' into gingerbread-plus-aosp
* commit '
7482648141995c52f5e3aeddb3b44092923cb33a':
Updated the warning about old-style inner class metadata to reflect
Dan Bornstein [Fri, 25 Jun 2010 01:29:18 +0000 (18:29 -0700)]
Merge "Updated the warning about old-style inner class metadata to reflect the current understanding of the situation." into gingerbread
Dan Bornstein [Thu, 24 Jun 2010 21:51:17 +0000 (14:51 -0700)]
Updated the warning about old-style inner class metadata to reflect
the current understanding of the situation.
The change affects diagnostic output but doesn't change anything about
dex file production, per se. I also added a new test each for dx and
the vm, checking that the warning gets emitted and demonstrating the
effect (respectively).
Though it's a pretty minor change, I bumped up the version number of dx.
Added bonus: Wrapped a couple of too-long lines that I happened to notice.
Bug:
2171430
Change-Id: If6afa4ba88dca9b0e6d88603e0a5fc2e36358115
Elliott Hughes [Thu, 24 Jun 2010 23:23:45 +0000 (16:23 -0700)]
am
6626af93: Merge "Remove the 060-reflection-security test." into gingerbread
Merge commit '
6626af931dad11d2c2035cbd1f2e1593fb3097b8' into gingerbread-plus-aosp
* commit '
6626af931dad11d2c2035cbd1f2e1593fb3097b8':
Remove the 060-reflection-security test.
Elliott Hughes [Thu, 24 Jun 2010 23:21:56 +0000 (16:21 -0700)]
Merge "Remove the 060-reflection-security test." into gingerbread
Elliott Hughes [Thu, 24 Jun 2010 23:11:03 +0000 (16:11 -0700)]
Remove the 060-reflection-security test.
Bug:
2796887
Change-Id: I30879565343ea00db042a9608c5bac27cef66bb3
The Android Open Source Project [Tue, 22 Jun 2010 21:28:00 +0000 (14:28 -0700)]
merge from open-source master
Change-Id: Ie085bcbe5ce7d055b4c3b3f82d68fed62b4793f7
Andy McFadden [Tue, 22 Jun 2010 20:21:00 +0000 (13:21 -0700)]
Merge "dalvik: use pthread_setname_np() to set the name of the current thread"
The Android Open Source Project [Mon, 21 Jun 2010 17:59:37 +0000 (10:59 -0700)]
merge from froyo-plus-aosp
Change-Id: I42dc1a2946b44b870f4fbf21522c20974e8dfd39
Ying Wang [Tue, 15 Jun 2010 22:23:41 +0000 (15:23 -0700)]
am
ff9aa9bf: am
9a2b2f76: Don\'t build dx if it\'s an app-only build.
Merge commit '
ff9aa9bfadcd4b17b078dfad65e0d700ea8c237a' into gingerbread-plus-aosp
* commit '
ff9aa9bfadcd4b17b078dfad65e0d700ea8c237a':
Don't build dx if it's an app-only build.
Ying Wang [Tue, 15 Jun 2010 22:21:26 +0000 (15:21 -0700)]
am
9a2b2f76: Don\'t build dx if it\'s an app-only build.
Merge commit '
9a2b2f7678128a5385c83ea393d73cf3cdfcbe46' into gingerbread
* commit '
9a2b2f7678128a5385c83ea393d73cf3cdfcbe46':
Don't build dx if it's an app-only build.
The Android Open Source Project [Tue, 15 Jun 2010 21:46:37 +0000 (14:46 -0700)]
merge from open-source master
Change-Id: I919a5dd1cc8d615c2d9224ff08e849394ee84df0
Ying Wang [Tue, 15 Jun 2010 21:27:30 +0000 (14:27 -0700)]
am
9a2b2f76: Don\'t build dx if it\'s an app-only build.
Merge commit '
9a2b2f7678128a5385c83ea393d73cf3cdfcbe46' into froyo-plus-aosp
* commit '
9a2b2f7678128a5385c83ea393d73cf3cdfcbe46':
Don't build dx if it's an app-only build.
Mikael Ohlson [Tue, 23 Mar 2010 13:06:19 +0000 (14:06 +0100)]
New implementation for java.lang.Runtime's availableProcessors().
This patch adds a native implementation for availableProcessors(),
replacing the hardcoded "always return 1" implementation.
It uses sysconf(_SC_NPROCESSORS_ONLN) to get the number of online
processors.
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
Andy McFadden [Mon, 14 Jun 2010 20:41:09 +0000 (13:41 -0700)]
am
e0b23da8: Merge "Tweak sanity check." into gingerbread
Merge commit '
e0b23da8dfde8ed232bb03887762e580e0c4e04c' into gingerbread-plus-aosp
* commit '
e0b23da8dfde8ed232bb03887762e580e0c4e04c':
Tweak sanity check.
Andy McFadden [Mon, 14 Jun 2010 20:39:32 +0000 (13:39 -0700)]
Merge "Tweak sanity check." into gingerbread
Andy McFadden [Mon, 14 Jun 2010 20:37:49 +0000 (13:37 -0700)]
Tweak sanity check.
Somebody managed to overrun this.
Change-Id: Ibf7d6a9831d20ce4093fae8e67c835257b2c51a1
The Android Open Source Project [Mon, 14 Jun 2010 18:24:54 +0000 (11:24 -0700)]
merge from froyo-plus-aosp
Change-Id: Ie16c2a8d6465fb0b2d2a06027b29a6bbe4ff9d16
Ying Wang [Fri, 11 Jun 2010 20:54:13 +0000 (13:54 -0700)]
Don't build dx if it's an app-only build.
Change-Id: I609f21e78b7bbac9af25ac1bc6bd5d3941ea462a
Andy McFadden [Fri, 11 Jun 2010 17:47:28 +0000 (10:47 -0700)]
am
891416ef: Update armv7-a-neon.
Merge commit '
891416ef725a5d9e64e5a1422f65394068c6e106' into gingerbread-plus-aosp
* commit '
891416ef725a5d9e64e5a1422f65394068c6e106':
Update armv7-a-neon.
Andy McFadden [Fri, 11 Jun 2010 17:43:37 +0000 (10:43 -0700)]
Update armv7-a-neon.
An externally-contributed fix was not able to update the armv7-a-neon
output files, because they don't exist in the open-source repository.
All I did was re-run rebuild.sh.
Change-Id: I3bf436ee8c0f57deb033815fd07f1a531ce851a1
The Android Open Source Project [Fri, 11 Jun 2010 16:33:03 +0000 (09:33 -0700)]
merge from open-source master
Change-Id: I5eed9fe77b936312b227cca4b7f3a9da2f5bf694
Andy McFadden [Thu, 10 Jun 2010 17:23:50 +0000 (10:23 -0700)]
am
805800d7: Merge "Up the version to 1.3.0." into kraken
Andy McFadden [Thu, 10 Jun 2010 17:22:17 +0000 (10:22 -0700)]
Merge "Up the version to 1.3.0." into kraken
Andy McFadden [Thu, 10 Jun 2010 05:31:32 +0000 (22:31 -0700)]
Up the version to 1.3.0.
Make it one up from froyo.
Change-Id: I9f5170be0ab5f301e994f10300d81f60a01335f7
Johnnie Birch [Wed, 9 Jun 2010 22:03:27 +0000 (15:03 -0700)]
Fix for x86-atom/CALLABI.S to handle failure for android.jni.cts.JniStaticTest#test_returnChar. CALLABI.S was not returning unsigned shorts correctly.
Change-Id: Ia6b443d41a96b0f65739c0b16a0ddb39f7eb33fa
André Goddard Rosa [Wed, 9 Jun 2010 23:32:14 +0000 (20:32 -0300)]
dalvik: use pthread_setname_np() to set the name of the current thread
Introduced originally in bionic by
https://review.source.android.com/#change,14740
Change-Id: I624dba3847975b5cb3c0543a5fb6d6f6986e11b5
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
The Android Open Source Project [Fri, 4 Jun 2010 21:03:54 +0000 (14:03 -0700)]
am
54709cb2: am
bf11852a: merge from open-source master
The Android Open Source Project [Fri, 4 Jun 2010 21:02:48 +0000 (14:02 -0700)]
am
bf11852a: merge from open-source master
Merge commit '
bf11852aa3b56f1f77841dd0dbb3cc984711d674' into kraken
* commit '
bf11852aa3b56f1f77841dd0dbb3cc984711d674':
Fix for use of UNPREDICTABLE register combination
The Android Open Source Project [Fri, 4 Jun 2010 21:01:00 +0000 (14:01 -0700)]
merge from open-source master
Change-Id: Ic827f3b9a61ba4bfe72606950b6b34a5caf9d9bd
Dave Butcher [Wed, 2 Jun 2010 13:52:21 +0000 (14:52 +0100)]
Fix for use of UNPREDICTABLE register combination
Use of the LDRD instruction form LDRD Rt, Rt2, [Rn, Rm] has restrictions
on the register combinations - specifically if Rt or Rt2 is equal to Rn or
Rm the behaviour is defined as 'UNPREDICTABLE'.
Change-Id: I19834783865e07897cc7012367e698447f023ce6
Jeff Brown [Thu, 3 Jun 2010 21:24:59 +0000 (14:24 -0700)]
am
23971e39: Merge "Added a new JNI helper for logging exceptions. Plugged some JNI reference leaks in existing JNI helpers." into kraken
Jeff Brown [Thu, 3 Jun 2010 21:23:25 +0000 (14:23 -0700)]
Merge "Added a new JNI helper for logging exceptions. Plugged some JNI reference leaks in existing JNI helpers." into kraken
Christopher Tate [Thu, 3 Jun 2010 18:09:32 +0000 (11:09 -0700)]
am
97e34d0d: am
c023ae6a: am
962f896e: Add /proc/pid/task/tid/schedstat info to thread stack dumps
Christopher Tate [Thu, 3 Jun 2010 18:07:49 +0000 (11:07 -0700)]
am
c023ae6a: am
962f896e: Add /proc/pid/task/tid/schedstat info to thread stack dumps
Merge commit '
c023ae6afcdd37b26dd16be43b023a93acc90905' into kraken
* commit '
c023ae6afcdd37b26dd16be43b023a93acc90905':
Add /proc/pid/task/tid/schedstat info to thread stack dumps
Christopher Tate [Thu, 3 Jun 2010 18:06:14 +0000 (11:06 -0700)]
am
962f896e: Add /proc/pid/task/tid/schedstat info to thread stack dumps
Merge commit '
962f896e1eeb159a6a2ac7a560708939cbb15575' into froyo-plus-aosp
* commit '
962f896e1eeb159a6a2ac7a560708939cbb15575':
Add /proc/pid/task/tid/schedstat info to thread stack dumps
Christopher Tate [Wed, 2 Jun 2010 23:17:46 +0000 (16:17 -0700)]
Add /proc/pid/task/tid/schedstat info to thread stack dumps
This lets us see whether a usually-blocked thread is actually making
progress in between stack snapshots.
Change-Id: If191627e4572457579d5f330d31bde86b8ce4ec5
Jeff Brown [Wed, 2 Jun 2010 04:07:08 +0000 (21:07 -0700)]
Added a new JNI helper for logging exceptions.
Plugged some JNI reference leaks in existing JNI helpers.
Change-Id: I62213cdae375235f6ee9304ecd8dc3d2b7f58c85
Andy McFadden [Fri, 28 May 2010 20:02:16 +0000 (13:02 -0700)]
am
67e82fb1: Merge "Atomic/SMP update, part 2." into kraken
Andy McFadden [Fri, 28 May 2010 20:00:21 +0000 (13:00 -0700)]
Merge "Atomic/SMP update, part 2." into kraken
buzbee [Thu, 27 May 2010 19:39:12 +0000 (12:39 -0700)]
am
a02fe785: am
4d24105a: am
2b469f82: Jit: Fix for
2717275 First JIT bug reported by external developers
buzbee [Thu, 27 May 2010 19:37:16 +0000 (12:37 -0700)]
am
4d24105a: am
2b469f82: Jit: Fix for
2717275 First JIT bug reported by external developers
Merge commit '
4d24105a25ae285c324103843b9859c75e3f1a4c' into kraken
* commit '
4d24105a25ae285c324103843b9859c75e3f1a4c':
Jit: Fix for
2717275 First JIT bug reported by external developers
android-build SharedAccount [Thu, 27 May 2010 19:35:31 +0000 (12:35 -0700)]
buzbee [Thu, 27 May 2010 19:35:14 +0000 (12:35 -0700)]
am
2b469f82: Jit: Fix for
2717275 First JIT bug reported by external developers
Merge commit '
2b469f82df14749c67da43f073fd7a9b6b1ccd74' into froyo-plus-aosp
* commit '
2b469f82df14749c67da43f073fd7a9b6b1ccd74':
Jit: Fix for
2717275 First JIT bug reported by external developers
android-build SharedAccount [Thu, 27 May 2010 19:33:39 +0000 (12:33 -0700)]
am
c0ebbcd5: Merge commit \'
720d1e962e248a30f81c1493081ff4c01e35c839\' into froyo-plus-aosp
Merge commit '
c0ebbcd5341625fbbba594d45ecffdfb83637f41' into kraken
* commit '
c0ebbcd5341625fbbba594d45ecffdfb83637f41':
Disable SSL Session Ticket extension for OpenSSLSocket
android-build SharedAccount [Thu, 27 May 2010 19:30:13 +0000 (12:30 -0700)]
Andy McFadden [Thu, 27 May 2010 17:23:41 +0000 (10:23 -0700)]
Atomic/SMP update, part 2.
Updated "generic" quasiatomic implementation to use atomic release store
instead of atomic swap when releasing the lock.
Track change to name of memory barrier.
Change-Id: Ie6ec37bca6984553f665bd25385210ea6c8e0943
buzbee [Wed, 26 May 2010 21:48:04 +0000 (14:48 -0700)]
Jit: Fix for
2717275 First JIT bug reported by external developers
The JIT was incorrectly keeping a short value in a floating point
register rather than copying it to a core register before storing.
There was an assert to catch this case, but asserts don't fire in
production builds.
The fix is safe and simple - just exclude this case from the "optimization".
Change-Id: I38f1865da11ef3f78213f84967d4737e066b9c68
Andy McFadden [Fri, 21 May 2010 19:06:30 +0000 (12:06 -0700)]
am
6a877083: Atomic/SMP update.
Andy McFadden [Thu, 20 May 2010 05:36:33 +0000 (22:36 -0700)]
Atomic/SMP update.
Moved quasiatomic 64-bit operations in here. They still need work.
Use the new libcutils atomic-inline header for our memory barriers.
Adjust makefiles to set SMP definition appropriately.
Change-Id: Id2ab2123724bb0baeb32f862b5568392aba35a59
Brian Carlstrom [Thu, 13 May 2010 23:30:53 +0000 (16:30 -0700)]
Disable SSL Session Ticket extension for OpenSSLSocket
Due to compatability issues with some sites, disable this SSL extension which wasn't present in Eclair. See also:
b/
2682876 Some ssl sites cause "A secure connection could not be established" error
Change-Id: Ib42fb249eb0f8d645ae3f983c77cb278ca54f946
Jesse Wilson [Tue, 11 May 2010 17:25:51 +0000 (10:25 -0700)]
am
e54a4c58: am
ff11012d: am
f3377c64: Merge "Remove test runner tool vogar from Froyo." into froyo
Jesse Wilson [Tue, 11 May 2010 17:23:30 +0000 (10:23 -0700)]
am
ff11012d: am
f3377c64: Merge "Remove test runner tool vogar from Froyo." into froyo
Merge commit '
ff11012d99f01ba9c0b9c66f7ae089df8d93f813' into kraken
* commit '
ff11012d99f01ba9c0b9c66f7ae089df8d93f813':
Remove test runner tool vogar from Froyo.
android-build SharedAccount [Tue, 11 May 2010 17:23:09 +0000 (10:23 -0700)]
android-build SharedAccount [Tue, 11 May 2010 17:22:04 +0000 (10:22 -0700)]
am
677fead0: Merge commit \'
264952afbf3986a2af4c2fa6b8daaed04f34fee8\' into froyo-plus-aosp
Merge commit '
677fead05d1df2457c1f9a92d193b809b91319c0' into kraken
* commit '
677fead05d1df2457c1f9a92d193b809b91319c0':
b/
2663512: "java.io.IOException: SSL shutdown failed.: Ok" shouldn't dump a stacktrace
Jesse Wilson [Tue, 11 May 2010 17:18:31 +0000 (10:18 -0700)]
am
f3377c64: Merge "Remove test runner tool vogar from Froyo." into froyo
Merge commit '
f3377c64212d5ebda0799d42659bde3e8f488b29' into froyo-plus-aosp
* commit '
f3377c64212d5ebda0799d42659bde3e8f488b29':
Remove test runner tool vogar from Froyo.
android-build SharedAccount [Tue, 11 May 2010 17:14:32 +0000 (10:14 -0700)]
Jesse Wilson [Mon, 10 May 2010 22:44:52 +0000 (15:44 -0700)]
Merge "Remove test runner tool vogar from Froyo." into froyo
Jesse Wilson [Mon, 10 May 2010 21:39:20 +0000 (14:39 -0700)]
Remove test runner tool vogar from Froyo.
This tool has been open sourced independently and it will be quite
awkward for external contributors who attempt to use or contribute
to this dead copy. This code is test only and not used by the
production runtime.
http://code.google.com/p/vogar/
Change-Id: Ib53bdfdb600330e1a2f200b5747305fc527a78a6
Brian Carlstrom [Fri, 7 May 2010 16:58:15 +0000 (09:58 -0700)]
b/
2663512: "java.io.IOException: SSL shutdown failed.: Ok" shouldn't dump a stacktrace
Gutted OpenSSLSocketImpl finalizer. The comment from the code
(excepted below) explains in detail the trouble of having the
finalizer do anything more than touch its the instances own state due
to unpredictable order of finalization and the future possability of
parallel finalization.
/*
* Just worry about our own state. Notably we do not try and
* close anything. The SocketImpl, either our own
* PlainSocketImpl, or the Socket we are wrapping, will do
* that. This might mean we do not properly SSL_shutdown, but
* if you want to do that, properly close the socket yourself.
*
* The reason why we don't try to SSL_shutdown is that there
* can be a race between finalizers where the PlainSocketImpl
* finalizer runs first and closes the socket. However, in the
* meanwhile, the underlying file descriptor could be reused
* for another purpose. If we call SSL_shutdown after that, the
* underlying socket BIOs still have the older file descriptor
* and will write the close notify to some unsuspecting
* reader.
*/
Tested extensively in mainline with existing tests.xnet.AllTests as
well as new javax.net.ssl tests. Sanity tested in froyo with
tests.xnet.AllTests and browser testing.
Change-Id: I85e0e086b43b2ad79304f2cf42721d09cc41a5f4
Dan Egnor [Fri, 7 May 2010 04:15:02 +0000 (21:15 -0700)]
am
645689db: am
42b68d1a: am
818164b8: Revert "Plug leak in class initialization."
Dan Egnor [Fri, 7 May 2010 04:13:51 +0000 (21:13 -0700)]
am
42b68d1a: am
818164b8: Revert "Plug leak in class initialization."
Merge commit '
42b68d1aef220145fc7c06ca469d2693e96e9801' into kraken
* commit '
42b68d1aef220145fc7c06ca469d2693e96e9801':
Revert "Plug leak in class initialization."
Dan Egnor [Fri, 7 May 2010 04:10:17 +0000 (21:10 -0700)]
am
818164b8: Revert "Plug leak in class initialization."
Merge commit '
818164b87a9c08a938c371d8b47987a3af06d6f6' into froyo-plus-aosp
* commit '
818164b87a9c08a938c371d8b47987a3af06d6f6':
Revert "Plug leak in class initialization."
Dan Egnor [Fri, 7 May 2010 03:56:14 +0000 (20:56 -0700)]
Revert "Plug leak in class initialization."
This reverts commit
d07cf9d69dddeebb91386a88f7b6d2323cf125a9.
Bug:
2664424
Change-Id: I1a36469757f2f20fb29b3bcf04e2a23aa7b72dca
Jean-Baptiste Queru [Thu, 6 May 2010 23:34:42 +0000 (16:34 -0700)]
am
71c9526e: am
99632b11: manual merge from froyo
Jean-Baptiste Queru [Thu, 6 May 2010 23:34:39 +0000 (16:34 -0700)]
am
173de779: am
b2520c7f: manual merge from froyo
Jean-Baptiste Queru [Thu, 6 May 2010 23:31:40 +0000 (16:31 -0700)]
am
99632b11: manual merge from froyo
Merge commit '
99632b1107cfec56f07aa4941e770e5d449391b7' into kraken
* commit '
99632b1107cfec56f07aa4941e770e5d449391b7':
Plug leak in class initialization.
Jean-Baptiste Queru [Thu, 6 May 2010 23:31:38 +0000 (16:31 -0700)]
am
b2520c7f: manual merge from froyo
Merge commit '
b2520c7f1348cfcb3fa9c2e039140c1addb7688a' into kraken
* commit '
b2520c7f1348cfcb3fa9c2e039140c1addb7688a':
DO NOT MERGE: Rewrite the HTTP connection pool used by HttpURLConnection.
Jean-Baptiste Queru [Thu, 6 May 2010 23:20:19 +0000 (16:20 -0700)]
manual merge from froyo
Change-Id: Ied6d44cd7a54a62e4613b026b8ca9451630f63e1
Jean-Baptiste Queru [Thu, 6 May 2010 23:20:06 +0000 (16:20 -0700)]
manual merge from froyo
Change-Id: I0f7ff92c18a3d047047fd8aca04e0bda4a8c97b9
Andy McFadden [Thu, 6 May 2010 20:39:07 +0000 (13:39 -0700)]
Plug leak in class initialization.
Don't add static fields and methods to the resolved-items table if the
defining class is still being initialized. If we do, other threads can
then access those fields and methods without first performing an "is the
class initialized" test.
We will end up performing static field and method resolution more often
now than before. On a Nexus One, zygote class preload time went from
2227ms to 2239ms (i.e. the performance difference is in the noise).
Bug
2655384.
Change-Id: Ib0c285ef23d58ae709be65f09efb68e73f982084
Andy McFadden [Thu, 6 May 2010 22:07:48 +0000 (15:07 -0700)]
am
80a4e249: Dalvik Zip rewrite.
Andy McFadden [Fri, 23 Apr 2010 23:34:52 +0000 (16:34 -0700)]
Dalvik Zip rewrite.
Change the way zip archives are handled. This is necessary to deal with
very large (~1GB) APK files, for which our current approach of mapping
the entire file falls over.
We now do the classic scavenger hunt for the End Of Central Directory magic
on a buffer of data read from the file, instead of a memory-mapped section.
We use what we find to create a map that covers the Central Directory only.
For most uses in the VM this is all we really need, since we just want
to check file attributes vs. the optimized DEX to see if we're out of date.
If the caller is interested in unpacking the file contents, we have to
do an additional file read to discover the size of the Local File Header
section so we can skip past it. We also now do a file-to-file extraction
using read() calls instead of a buffer-to-file extraction on mmap()ed data.
No difference in performance (as measured by first-boot dexopt).
Since this is more of a rewrite than an update, I also took the opportunity
to change buffer size variables from "long" to "size_t", and normalized
return values to int (some were using bool, which is common in the VM but
was mixed in the zip code). Failure messages are now all LOGW with the
word "Zip" up front (didn't want to change log tag away from "dalvikvm").
Also, removed a not-quite-right check in the "map part of a file" code,
and clarified that the file offset is absolute.
For bug
2620103.
Change-Id: I745fb15abb541376f467969ffe422222676f1e5f
Jesse Wilson [Thu, 6 May 2010 17:54:21 +0000 (10:54 -0700)]
DO NOT MERGE: Rewrite the HTTP connection pool used by HttpURLConnection.
This started off as incremental changes, but it ended up going
far enough that it earned the "rewrite" badge.
System.getProperty() is not called for every HTTP connection.
This is slightly controversial, but the old code had to bend
over backwards to support dynamic pool changes, and it didn't
even support the case when the pool shrank but not to 0.
The new code doesn't do I/O within static synchronized blocks.
This should reduce contention described here: http://b/issue?id=
2606547
Also: simpify implementation, prettier names, more focused doc.
Originally submitted to dalvik-dev.
https://android-git.corp.google.com/g/49309
Change-Id: I815c3123838b29cd2d9b39346e5c2486e1f5a2d2
Jesse Wilson [Wed, 5 May 2010 21:17:36 +0000 (14:17 -0700)]
am
f6cd559a: am
c2c14690: am
4751c150: Fixing bulk reads in ByteArray.MyInputStream
Jesse Wilson [Wed, 5 May 2010 21:16:14 +0000 (14:16 -0700)]
am
c2c14690: am
4751c150: Fixing bulk reads in ByteArray.MyInputStream
Merge commit '
c2c146902f6258c16612b05d4b281c8a60b59898' into kraken
* commit '
c2c146902f6258c16612b05d4b281c8a60b59898':
Fixing bulk reads in ByteArray.MyInputStream
Jesse Wilson [Wed, 5 May 2010 21:14:22 +0000 (14:14 -0700)]
am
4751c150: Fixing bulk reads in ByteArray.MyInputStream
Merge commit '
4751c150542ec282f6c6d58984974edec6c0a045' into froyo-plus-aosp
* commit '
4751c150542ec282f6c6d58984974edec6c0a045':
Fixing bulk reads in ByteArray.MyInputStream
Jesse Wilson [Mon, 3 May 2010 22:27:11 +0000 (15:27 -0700)]
Fixing bulk reads in ByteArray.MyInputStream
This has never worked properly, but it didn't matter until recently
because neither the JDK's nor early Dalvik's DataInputStream was
exercising it. But in 2.0, Dalvik's DataInputStream prefers bulk
reads, which exercises this code when run on-device.
http://code.google.com/p/android/issues/detail?id=8115
The problem was that System.arraycopy call didn't include the start
offset in the call.
Andy McFadden [Tue, 4 May 2010 00:10:48 +0000 (17:10 -0700)]
am
80f7e83f: am
78115b68: am
c03da3e8: Fix breakpoint handling on switch statements.
Andy McFadden [Tue, 4 May 2010 00:09:16 +0000 (17:09 -0700)]
am
78115b68: am
c03da3e8: Fix breakpoint handling on switch statements.
Merge commit '
78115b6899e6aa70a3834c3a5f7df9c53765b4ee' into kraken
* commit '
78115b6899e6aa70a3834c3a5f7df9c53765b4ee':
Fix breakpoint handling on switch statements.
Andy McFadden [Tue, 4 May 2010 00:08:07 +0000 (17:08 -0700)]
am
c03da3e8: Fix breakpoint handling on switch statements.
Merge commit '
c03da3e87a0537b211f2300d594597d84898b8f7' into froyo-plus-aosp
* commit '
c03da3e87a0537b211f2300d594597d84898b8f7':
Fix breakpoint handling on switch statements.
Andy McFadden [Mon, 3 May 2010 23:11:20 +0000 (16:11 -0700)]
Fix breakpoint handling on switch statements.
Some debuggers (Eclipse and IntelliJ, but not jdb) appear to set
breakpoints at all addresses associated with a given bytecode offset.
Because dx emits line number information for the data tables used
by "switch" statements, we end up setting a breakpoint on the start
of the switch data.
In the past this wasn't a problem, but now that we're using "hard"
breakpoints it's causing the magic number at the start of the table
to be overwritten. An explict test on the magic number is causing
the intepreter to throw an InternalError.
The quick fix is to refuse to stomp on a "magic" NOP. Assuming the
line number table is otherwise valid and doesn't point into the middle
of a multi-word instruction, this should solve the problem. (We can
check this during verification.)
Bug
2643148.
Change-Id: Ic96947da14ea2346a67f0eb769a1c006153da448
The Android Open Source Project [Mon, 3 May 2010 23:19:05 +0000 (16:19 -0700)]
am
e5ab92a2: am
cf6ab741: merge from open-source master
The Android Open Source Project [Mon, 3 May 2010 23:17:51 +0000 (16:17 -0700)]
am
cf6ab741: merge from open-source master
Merge commit '
cf6ab741c2a50b61d6cf1b1617e7a908caece6dd' into kraken
* commit '
cf6ab741c2a50b61d6cf1b1617e7a908caece6dd':
Adapt to new location of libcore
Delete libcore, now in its own project