OSDN Git Service
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:23:36 +0000 (15:23 -0700)]
am
26a4777e: (-s ours) Reconcile with jb-dev - do not merge
* commit '
26a4777e884b78a2133762bc2095eaa7b9583054':
Jean-Baptiste Queru [Wed, 3 Oct 2012 22:21:32 +0000 (15:21 -0700)]
Reconcile with jb-dev - do not merge
Change-Id: Id493d6f47e331b0aade672a98ce14251eb721121
The Android Open Source Project [Tue, 2 Oct 2012 16:16:54 +0000 (09:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I5d4d6765bba6a3a0ba8a3007098bc53e5c455139
Jeff Sharkey [Mon, 1 Oct 2012 17:15:42 +0000 (10:15 -0700)]
am
42e89067: am
2e3748ed: Final shuffle to make /sdcard work in shell.
* commit '
42e8906761b3c0e07799aae72d90516cd27002a2':
Final shuffle to make /sdcard work in shell.
The Android Automerger [Mon, 1 Oct 2012 01:17:26 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Sun, 30 Sep 2012 20:23:29 +0000 (13:23 -0700)]
am
2e3748ed: Final shuffle to make /sdcard work in shell.
* commit '
2e3748ed8161e710d1a4d9f8070e16ce3350209a':
Final shuffle to make /sdcard work in shell.
Jeff Sharkey [Sun, 30 Sep 2012 19:46:06 +0000 (12:46 -0700)]
Final shuffle to make /sdcard work in shell.
Always prepare legacy path, since it's no longer created by init.
Bug:
7255202
Change-Id: I152b44ac62f69923b300abc8d394afe79dac4601
Jean-Baptiste Queru [Fri, 28 Sep 2012 21:18:15 +0000 (14:18 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: I1483d6b8ea36ce97587978cdcd4558ce8835f981
Elliott Hughes [Thu, 27 Sep 2012 00:32:01 +0000 (17:32 -0700)]
am
589cc576: am
f75aa0de: Merge "Log if dlopen(3) fails."
* commit '
589cc5762de40679fa739f5913a3f7f4367cca7e':
Log if dlopen(3) fails.
Elliott Hughes [Thu, 27 Sep 2012 00:30:19 +0000 (17:30 -0700)]
am
f75aa0de: Merge "Log if dlopen(3) fails."
* commit '
f75aa0de3d243466f56d262de08da3808ad34cf3':
Log if dlopen(3) fails.
Elliott Hughes [Thu, 27 Sep 2012 00:12:26 +0000 (17:12 -0700)]
Merge "Log if dlopen(3) fails."
Elliott Hughes [Wed, 26 Sep 2012 23:40:41 +0000 (16:40 -0700)]
Log if dlopen(3) fails.
It turns out that some apps swallow the UnsatisfiedLinkError, making it
really hard to work out why they failed to launch.
Before:
D dalvikvm: Trying to load lib /data/app-lib/com.adobe.air-1/libCore.so 0x415be8a8
W dalvikvm: No implementation found for native Lcom/adobe/air/AIRWindowSurfaceView;.nativeSurfaceCreated:()V
After:
D dalvikvm: Trying to load lib /data/app-lib/com.adobe.air-1/libCore.so 0x415be8a8
E dalvikvm: dlopen("/data/app-lib/com.adobe.air-1/libCore.so") failed: Cannot load library: soinfo_relocate(linker.cpp:975): cannot locate symbol "_ZN7android10VectorImpl19reservedVectorImpl1Ev" referenced by "libCore.so"...
W dalvikvm: No implementation found for native Lcom/adobe/air/AIRWindowSurfaceView;.nativeSurfaceCreated:()V
(cherry-pick of
6567510ba1470bba6036d2b0b042425bdd03cf2b.)
Bug:
7093208
Change-Id: I4dcdff2ffe49a4897d8f5279d09a0dcc3de70db6
The Android Open Source Project [Wed, 26 Sep 2012 16:06:04 +0000 (09:06 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I96d2704e9f9c0e3af3a0553a3e856aaa0d72bf1c
The Android Automerger [Wed, 26 Sep 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ian Rogers [Tue, 25 Sep 2012 19:50:17 +0000 (12:50 -0700)]
am
9d9919e9: Merge "Allow max free size of heap to be configured." into jb-mr1-dev
* commit '
9d9919e93c3af16888cf90c475fff63758d73770':
Allow max free size of heap to be configured.
Ian Rogers [Tue, 25 Sep 2012 19:32:13 +0000 (12:32 -0700)]
am
9d9919e9: Merge "Allow max free size of heap to be configured." into jb-mr1-dev
* commit '
9d9919e93c3af16888cf90c475fff63758d73770':
Allow max free size of heap to be configured.
Ian Rogers [Tue, 25 Sep 2012 18:34:18 +0000 (11:34 -0700)]
Merge "Allow max free size of heap to be configured." into jb-mr1-dev
The Android Automerger [Tue, 25 Sep 2012 13:59:20 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ian Rogers [Sun, 23 Sep 2012 23:33:32 +0000 (16:33 -0700)]
Allow max free size of heap to be configured.
This allows the max free to be larger on devices with more memory and
thereby avoid GCs (that may be more frequent due to larger bitmaps).
b/
6606849
Change-Id: I4063a303ea4be3c1f227259d699fb238a806451f
Jeff Sharkey [Tue, 25 Sep 2012 00:44:40 +0000 (17:44 -0700)]
am
5005743f: Move multi-user OBB under user-specific path.
* commit '
5005743f9b35effed87bbd9a9786f1f2e16bebe2':
Move multi-user OBB under user-specific path.
Jeff Sharkey [Tue, 25 Sep 2012 00:44:25 +0000 (17:44 -0700)]
am
5005743f: Move multi-user OBB under user-specific path.
* commit '
5005743f9b35effed87bbd9a9786f1f2e16bebe2':
Move multi-user OBB under user-specific path.
Jeff Sharkey [Mon, 24 Sep 2012 21:10:02 +0000 (14:10 -0700)]
Move multi-user OBB under user-specific path.
Support apps that may manually build OBB paths using
getExternalStorageDirectory() by making multi-user OBB paths live
under user-specific path.
This new structure means we can simplify the emulated_legacy paths
to be a single recursive bind mount.
Bug:
7212801
Change-Id: I85a0caebca52a6ff3bfe61c961518a91f0b8f8ff
Jean-Baptiste Queru [Sat, 22 Sep 2012 00:47:51 +0000 (17:47 -0700)]
am
74573701: am
9bd5a9db: Reconcile jb-dev and AOSP
* commit '
74573701ee9863a0d2f1ba638b1c1cce69cdc2b2':
Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
Fix a bug where the max blowup of annotations was incorrect. do not merge.
Fix a bug where debugInfos' size wasn't being computed. do not merge.
Make dex merging stateless. do not merge.
Support debug info in dexmerge. do not merge.
Jean-Baptiste Queru [Fri, 21 Sep 2012 20:20:45 +0000 (13:20 -0700)]
am
74573701: am
9bd5a9db: Reconcile jb-dev and AOSP
* commit '
74573701ee9863a0d2f1ba638b1c1cce69cdc2b2':
Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
Fix a bug where the max blowup of annotations was incorrect. do not merge.
Fix a bug where debugInfos' size wasn't being computed. do not merge.
Make dex merging stateless. do not merge.
Support debug info in dexmerge. do not merge.
Jean-Baptiste Queru [Fri, 21 Sep 2012 20:19:04 +0000 (13:19 -0700)]
am
9bd5a9db: Reconcile jb-dev and AOSP
* commit '
9bd5a9db106863069dd6c12de881acca6103f8d7':
Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
Fix a bug where the max blowup of annotations was incorrect. do not merge.
Fix a bug where debugInfos' size wasn't being computed. do not merge.
Make dex merging stateless. do not merge.
Support debug info in dexmerge. do not merge.
Jean-Baptiste Queru [Fri, 21 Sep 2012 20:15:15 +0000 (13:15 -0700)]
Reconcile jb-dev and AOSP
Change-Id: If3d2ce0f23b929f92d49649e015386670ed16863
Elliott Hughes [Fri, 21 Sep 2012 18:04:56 +0000 (11:04 -0700)]
am
067c6202: am
74d4652e: am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
067c62027dc592224e1ae16f9847b7273d3e4026':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 20:01:34 +0000 (13:01 -0700)]
am
067c6202: am
74d4652e: am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
067c62027dc592224e1ae16f9847b7273d3e4026':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 19:58:45 +0000 (12:58 -0700)]
am
74d4652e: am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
74d4652ebd432295a5442b024f51bce531abea15':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 19:53:14 +0000 (12:53 -0700)]
am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
e64cfc1cdacd8a820acce596f6986e17e2f5e330':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 19:49:45 +0000 (12:49 -0700)]
am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
b79d90ebd197b9040c06d73f5dc8bbc8fdad1d54':
Log when the native trace is unavailable
Elliott Hughes [Thu, 20 Sep 2012 18:34:32 +0000 (11:34 -0700)]
Merge "Log when the native trace is unavailable"
Andy McFadden [Wed, 19 Sep 2012 00:50:59 +0000 (17:50 -0700)]
Log when the native trace is unavailable
This should allow us to differentiate between "couldn't get the
stack" and "didn't try to get the stack". Also show the thread's
state (e.g. 'R' for running, 'D' for uninterruptible syscall).
Bug
7053953
(cherry-pick of
b3667a19f5c573b7785876979af4781292d27327.)
Change-Id: I0a40cb3d3cdd9aef8589a39586cccd9c229aa8cb
The Android Open Source Project [Thu, 20 Sep 2012 17:35:05 +0000 (10:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I70fc7419598ce4c0f9aba005b8ade9d4f6682d2a
The Android Automerger [Thu, 20 Sep 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andy McFadden [Thu, 20 Sep 2012 13:19:19 +0000 (06:19 -0700)]
am
b3667a19: Log when the native trace is unavailable
* commit '
b3667a19f5c573b7785876979af4781292d27327':
Log when the native trace is unavailable
Andy McFadden [Wed, 19 Sep 2012 18:13:16 +0000 (11:13 -0700)]
am
b3667a19: Log when the native trace is unavailable
* commit '
b3667a19f5c573b7785876979af4781292d27327':
Log when the native trace is unavailable
Andy McFadden [Wed, 19 Sep 2012 00:50:59 +0000 (17:50 -0700)]
Log when the native trace is unavailable
This should allow us to differentiate between "couldn't get the
stack" and "didn't try to get the stack". Also show the thread's
state (e.g. 'R' for running, 'D' for uninterruptible syscall).
Bug
7053953
Change-Id: Ibc9e6a6f0fc855a4e5e8e133122232dc939bcb16
The Android Automerger [Tue, 18 Sep 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Mon, 17 Sep 2012 22:59:09 +0000 (15:59 -0700)]
am
86913b6b: am
90f12e0b: am
4535e29e: am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
86913b6b88b9ad4a1eea14be928da6c9485d53c0':
Use 0xde as the poison value after JIT code cache reset.
Elliott Hughes [Mon, 17 Sep 2012 22:57:41 +0000 (15:57 -0700)]
am
86913b6b: am
90f12e0b: am
4535e29e: am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
86913b6b88b9ad4a1eea14be928da6c9485d53c0':
Use 0xde as the poison value after JIT code cache reset.
Elliott Hughes [Mon, 17 Sep 2012 22:54:47 +0000 (15:54 -0700)]
am
90f12e0b: am
4535e29e: am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
90f12e0b4b08b9776b02580b223ec8968a5725b0':
Use 0xde as the poison value after JIT code cache reset.
Elliott Hughes [Mon, 17 Sep 2012 22:52:48 +0000 (15:52 -0700)]
am
4535e29e: am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
4535e29e384a400a62fe259674565c0e21c4c182':
Use 0xde as the poison value after JIT code cache reset.
Elliott Hughes [Mon, 17 Sep 2012 22:50:19 +0000 (15:50 -0700)]
am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
a177aa50c665e97f92ee7519ed9d32b0e89e84d3':
Use 0xde as the poison value after JIT code cache reset.
Elliott Hughes [Mon, 17 Sep 2012 22:47:11 +0000 (15:47 -0700)]
Merge "Use 0xde as the poison value after JIT code cache reset."
Ben Cheng [Mon, 17 Sep 2012 19:17:59 +0000 (12:17 -0700)]
Use 0xde as the poison value after JIT code cache reset.
(cherry-pick of
60497bbcee68d98b2bdcb3fb64682b00d61b942d.)
Change-Id: I4f8c1bac2ac3bdc1d931e91f3e2e8038fe4c2b5a
Ben Cheng [Mon, 17 Sep 2012 19:25:20 +0000 (12:25 -0700)]
am
ae341c38: Merge "Use 0xde as the poison value after JIT code cache reset." into jb-mr1-dev
* commit '
ae341c385bd23d73212e07e8e1c8bb5092c0e585':
Use 0xde as the poison value after JIT code cache reset.
Ben Cheng [Mon, 17 Sep 2012 19:25:11 +0000 (12:25 -0700)]
am
ae341c38: Merge "Use 0xde as the poison value after JIT code cache reset." into jb-mr1-dev
* commit '
ae341c385bd23d73212e07e8e1c8bb5092c0e585':
Use 0xde as the poison value after JIT code cache reset.
Ben Cheng [Mon, 17 Sep 2012 19:22:40 +0000 (12:22 -0700)]
Merge "Use 0xde as the poison value after JIT code cache reset." into jb-mr1-dev
Ben Cheng [Mon, 17 Sep 2012 19:17:59 +0000 (12:17 -0700)]
Use 0xde as the poison value after JIT code cache reset.
Change-Id: Ic25ede5bcd988f240d8c24df6bc5da81e2b03249
The Android Automerger [Sun, 16 Sep 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Fri, 14 Sep 2012 21:14:03 +0000 (14:14 -0700)]
am
dde72bb4: am
8e80f76a: am
d207be35: am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
dde72bb4edd23a319c02be9fcb3ee79757b26869':
Optimize those StrictMath routines that are identical to Math routines.
Elliott Hughes [Fri, 14 Sep 2012 21:13:59 +0000 (14:13 -0700)]
am
dde72bb4: am
8e80f76a: am
d207be35: am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
dde72bb4edd23a319c02be9fcb3ee79757b26869':
Optimize those StrictMath routines that are identical to Math routines.
Elliott Hughes [Fri, 14 Sep 2012 21:11:53 +0000 (14:11 -0700)]
am
8e80f76a: am
d207be35: am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
8e80f76abdeedb75ca0837545f6c33c2c452a928':
Optimize those StrictMath routines that are identical to Math routines.
Elliott Hughes [Fri, 14 Sep 2012 21:10:03 +0000 (14:10 -0700)]
am
d207be35: am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
d207be351aa5f8707a7829fc5cfd602b69b5bcc5':
Optimize those StrictMath routines that are identical to Math routines.
Elliott Hughes [Fri, 14 Sep 2012 21:08:24 +0000 (14:08 -0700)]
am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
f31a0600bb84e04280440c84a5966a624a89e117':
Optimize those StrictMath routines that are identical to Math routines.
Elliott Hughes [Fri, 14 Sep 2012 20:51:18 +0000 (13:51 -0700)]
Merge "Optimize those StrictMath routines that are identical to Math routines."
Elliott Hughes [Fri, 14 Sep 2012 18:54:57 +0000 (11:54 -0700)]
Optimize those StrictMath routines that are identical to Math routines.
We can just use the existing Math intinsics.
Bug:
7146208
Change-Id: I9e78d33cf65a5dcc5a7c0133e67bd9c3c1e43f23
The Android Automerger [Thu, 13 Sep 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Wed, 12 Sep 2012 18:00:09 +0000 (11:00 -0700)]
am
c524d17c: Merge "Missing EMULATED_STORAGE_TARGET isn\'t an error." into jb-mr1-dev
* commit '
c524d17cc39e429e4c6398f6c8f7d428bdc6885a':
Missing EMULATED_STORAGE_TARGET isn't an error.
Jeff Sharkey [Wed, 12 Sep 2012 18:00:00 +0000 (11:00 -0700)]
am
c524d17c: Merge "Missing EMULATED_STORAGE_TARGET isn\'t an error." into jb-mr1-dev
* commit '
c524d17cc39e429e4c6398f6c8f7d428bdc6885a':
Missing EMULATED_STORAGE_TARGET isn't an error.
Jeff Sharkey [Wed, 12 Sep 2012 17:58:20 +0000 (10:58 -0700)]
Merge "Missing EMULATED_STORAGE_TARGET isn't an error." into jb-mr1-dev
The Android Open Source Project [Wed, 12 Sep 2012 14:55:48 +0000 (07:55 -0700)]
am
acc6d354: am
91a17e5e: (-s ours) Reconcile with jb-release - do not merge
* commit '
acc6d354dbe440abdea964e791d826701feba035':
Test if new build is kicked off.
The Android Open Source Project [Wed, 12 Sep 2012 14:54:32 +0000 (07:54 -0700)]
am
acc6d354: (-s ours) am
91a17e5e: (-s ours) Reconcile with jb-release - do not merge
* commit '
acc6d354dbe440abdea964e791d826701feba035':
Test if new build is kicked off.
The Android Open Source Project [Wed, 12 Sep 2012 14:51:45 +0000 (07:51 -0700)]
am
91a17e5e: (-s ours) Reconcile with jb-release - do not merge
* commit '
91a17e5e78ddc49b761133151831770379dc777f':
Test if new build is kicked off.
The Android Open Source Project [Wed, 12 Sep 2012 14:49:15 +0000 (07:49 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I20cffa47e360af1eac86d8a04aa53441f9260bc6
The Android Open Source Project [Wed, 12 Sep 2012 14:39:45 +0000 (07:39 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I69693578d4b42350ec5f5cd4843f45a2234acbe4
The Android Automerger [Wed, 12 Sep 2012 13:59:21 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Wed, 12 Sep 2012 06:40:42 +0000 (23:40 -0700)]
Missing EMULATED_STORAGE_TARGET isn't an error.
Devices without emulated storage should just skip the tmpfs.
Bug:
7131382
Change-Id: I9c697e4faf7864ec3a2695cd3770fbf0c9a5cce3
Jeff Sharkey [Wed, 12 Sep 2012 06:38:18 +0000 (23:38 -0700)]
am
d8de46c4: Include user identifier in external storage paths.
* commit '
d8de46c475830792eeb6fb0f7b59aab51f55e817':
Include user identifier in external storage paths.
Ben Cheng [Tue, 11 Sep 2012 23:20:25 +0000 (16:20 -0700)]
Test if new build is kicked off.
Change-Id: Ia6a25f00cb28e80111b78d87180575d57c55b062
Jeff Sharkey [Sat, 8 Sep 2012 05:58:13 +0000 (22:58 -0700)]
Include user identifier in external storage paths.
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.
Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:
/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb
This change also creates two nested namespaces around zygote. The
first namespace is created when the zygote starts, and it holds a
single writable tmpfs, since rootfs is ro. The second namespace is
created quickly after forking, and is used to hold the private
user-specific bind mounts. (This design saves us from creating a
tmpfs-per-process.)
Bug:
7131382
Change-Id: Id80403ec956f0bff6997411cb1f82f273c76b85f
Jesse Wilson [Sat, 1 Sep 2012 04:37:56 +0000 (00:37 -0400)]
Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
In dex files, there are several places where one object refers
to another object by its position in the file. The dex merger
is generally very careful to adjust these mappings when combining
dex files.
Unfortunately one of these cases was broken. Each try_item refers
to a corresponding encoded_catch_handler by its byte offset in a
list. Most of the time this byte offset is the same in the input
dex file and the output dex file. But encoded_catch_handlers are
variable-length because they use a variable-length uleb128 encoding
to address the type_idx being caught. When dex files are merged,
some exception types may go from having a small index to having
a large index, increasing the number of bytes required to encode
that index. This breaks our ability to directly copy over offsets
as we were doing previously.
Bug: http://code.google.com/p/android/issues/detail?id=36490
(cherry picked from commit
d43341a24abe339d474b0b0d92669917ae2eb9bf)
Change-Id: I4e6ab791925a918513122b46e039c02dfef62ace
Jesse Wilson [Sat, 1 Sep 2012 05:01:05 +0000 (01:01 -0400)]
Fix a bug where the max blowup of annotations was incorrect. do not merge.
I'm not sure where the 1.34 number comes from but it's incorrect.
From the spec, the encoded_annotation is made up of a single byte
plus an unlimited number of uleb128 values. Each of these values
can double in width in the worst case. I received (personal) email
from one user who'd run into a case worse than the incorrect 1.34
limit.
(cherry picked from commit
bf7dfeea94f21dd0e097cf5f786f9995722fd70d)
Change-Id: I033a0d76ea0324d434d732e7757df0c3fd925b68
Jesse Wilson [Thu, 23 Aug 2012 06:20:26 +0000 (23:20 -0700)]
Fix a bug where debugInfos' size wasn't being computed. do not merge.
Previously debugInfos' size of 0 caused a malformed dex file
because debug data was present but not mentioned in the table
of contents.
(cherry picked from commit
55ac44b64744cd5692d6495bca99dfc8181e0cfc)
Change-Id: I2084c06521ea200772c523cdaa28c8019fa76025
The Android Open Source Project [Thu, 6 Sep 2012 14:52:54 +0000 (07:52 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I919d616f469b7ec741740c5eaadc076d7aa40dcc
The Android Automerger [Thu, 6 Sep 2012 13:33:32 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Thu, 6 Sep 2012 01:05:34 +0000 (18:05 -0700)]
am
21c93dc7: Remove /sdcard hack for shell users.
* commit '
21c93dc795dfbea3932e0273b1aa873051dde72c':
Remove /sdcard hack for shell users.
Jeff Sharkey [Wed, 5 Sep 2012 22:49:39 +0000 (15:49 -0700)]
Remove /sdcard hack for shell users.
Using a /storage/sdcard0 symlink and a tmpfs staging area was used
to enable "/sdcard" paths for both zygote processes and the shell
user, but it breaks on devices with both emulated and physical
external storage.
Specifically, vold can't mount a physical sdcard onto the primary
storage symlink, and zygote can't re-bind-mount when secondary
storage is remounted after dropping privileges.
Bug:
7094858,
7064600
Change-Id: Id91e3b3e521a3b3e1bb5358920adc66a0a43917f
Ian Rogers [Wed, 5 Sep 2012 14:54:36 +0000 (07:54 -0700)]
am
aa5ba914: am
e599c468: am
cfeacbdd: Merge "Remove unnecessary compiler pragma."
* commit '
aa5ba91402f60e6beba38d45903a71366ad3c9c1':
Remove unnecessary compiler pragma.
Ian Rogers [Wed, 5 Sep 2012 14:52:13 +0000 (07:52 -0700)]
am
e599c468: am
cfeacbdd: Merge "Remove unnecessary compiler pragma."
* commit '
e599c4684ac47fe6417b9c482b7ff651513988ff':
Remove unnecessary compiler pragma.
Ian Rogers [Wed, 5 Sep 2012 14:48:15 +0000 (07:48 -0700)]
am
cfeacbdd: Merge "Remove unnecessary compiler pragma."
* commit '
cfeacbdd0cdd71a7974ac623e6534d0221d93ed9':
Remove unnecessary compiler pragma.
Ian Rogers [Wed, 5 Sep 2012 14:41:00 +0000 (07:41 -0700)]
Merge "Remove unnecessary compiler pragma."
The Android Automerger [Wed, 5 Sep 2012 13:33:29 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Philippe Lesot [Wed, 5 Sep 2012 08:01:29 +0000 (01:01 -0700)]
am
2004e4eb: am
86e036a8: am
e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."
* commit '
2004e4eb058ca637f44501f738258b27a93b3f5b':
Fix an ugly bug where try/catch offsets weren't being mapped properly.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:59:27 +0000 (00:59 -0700)]
am
86e036a8: am
e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."
* commit '
86e036a83d596ebacb20c87c8f7bd8a8dfa98d9c':
Fix an ugly bug where try/catch offsets weren't being mapped properly.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:51:54 +0000 (00:51 -0700)]
am
e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."
* commit '
e6516a5395a20f2bf923753e4dd87ffd304074fb':
Fix an ugly bug where try/catch offsets weren't being mapped properly.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:47:38 +0000 (00:47 -0700)]
Merge "Fix an ugly bug where try/catch offsets weren't being mapped properly."
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:42:04 +0000 (00:42 -0700)]
am
b760cb53: am
93ee4913: am
f3b60d2f: Merge "Fix a bug where the max blowup of annotations was incorrect."
* commit '
b760cb537b8a63e23055ede9b1fcc11952c01785':
Fix a bug where the max blowup of annotations was incorrect.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:39:22 +0000 (00:39 -0700)]
am
93ee4913: am
f3b60d2f: Merge "Fix a bug where the max blowup of annotations was incorrect."
* commit '
93ee4913aa3d9a6b23f303fe0d03a0d07a8ae4d2':
Fix a bug where the max blowup of annotations was incorrect.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:35:15 +0000 (00:35 -0700)]
am
f3b60d2f: Merge "Fix a bug where the max blowup of annotations was incorrect."
* commit '
f3b60d2f07280dd6b0753223d4590e11e18a3985':
Fix a bug where the max blowup of annotations was incorrect.
Jean-Philippe Lesot [Wed, 5 Sep 2012 07:30:46 +0000 (00:30 -0700)]
Merge "Fix a bug where the max blowup of annotations was incorrect."
The Android Automerger [Mon, 3 Sep 2012 13:33:25 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Wilson [Sat, 1 Sep 2012 05:01:05 +0000 (01:01 -0400)]
Fix a bug where the max blowup of annotations was incorrect.
I'm not sure where the 1.34 number comes from but it's incorrect.
From the spec, the encoded_annotation is made up of a single byte
plus an unlimited number of uleb128 values. Each of these values
can double in width in the worst case. I received (personal) email
from one user who'd run into a case worse than the incorrect 1.34
limit.
Change-Id: I3b676e6d2b274aaa538ca61ce23945b3d49aff04
Jesse Wilson [Sat, 1 Sep 2012 04:37:56 +0000 (00:37 -0400)]
Fix an ugly bug where try/catch offsets weren't being mapped properly.
In dex files, there are several places where one object refers
to another object by its position in the file. The dex merger
is generally very careful to adjust these mappings when combining
dex files.
Unfortunately one of these cases was broken. Each try_item refers
to a corresponding encoded_catch_handler by its byte offset in a
list. Most of the time this byte offset is the same in the input
dex file and the output dex file. But encoded_catch_handlers are
variable-length because they use a variable-length uleb128 encoding
to address the type_idx being caught. When dex files are merged,
some exception types may go from having a small index to having
a large index, increasing the number of bytes required to encode
that index. This breaks our ability to directly copy over offsets
as we were doing previously.
Bug: http://code.google.com/p/android/issues/detail?id=36490
Change-Id: I3bdadf20899fdb5d4d074e69103b33c0404a31f8
Xavier Ducrohet [Mon, 11 Jun 2012 22:17:31 +0000 (15:17 -0700)]
Make dex merging stateless. do not merge.
This is required to run dx in Eclipse which doesn't unload the dx
library after each run.
(cherry-pick of
7aa5ce7e990dc3766eba97cd0932b62e4de21503.)
(cherry picked from commit
5e90165d5918f18aec0964bc475f4064e9143599)
Change-Id: Id5818f516539d13423b7cef4b2b1af30a9686b45
Elliott Hughes [Thu, 7 Jun 2012 23:47:38 +0000 (16:47 -0700)]
Support debug info in dexmerge. do not merge.
Bug:
4090053
Signed-off-by: Jesse Wilson <jesse@swank.ca>
(cherry picked from commit
bc23c4f3ebaefebb3f1be7732767631f91e165ea)
Change-Id: Ic59d3cc1866c2e4328e406f22cb23fc08d5c6d91
Jeff Sharkey [Thu, 30 Aug 2012 17:41:15 +0000 (10:41 -0700)]
am
a018360c: Merge "Access to all users\' external storage." into jb-mr1-dev
* commit '
a018360cab83a505d9f50338df20e4d495e4424d':
Access to all users' external storage.
Jeff Sharkey [Thu, 30 Aug 2012 17:38:52 +0000 (10:38 -0700)]
Merge "Access to all users' external storage." into jb-mr1-dev
Jeff Sharkey [Thu, 30 Aug 2012 17:32:06 +0000 (10:32 -0700)]
am
e66f926b: Merge "Shared OBB storage across users." into jb-mr1-dev
* commit '
e66f926bf413bbf3f1cde05bbe50b83043829056':
Shared OBB storage across users.