OSDN Git Service
Elliott Hughes [Thu, 20 Sep 2012 20:07:59 +0000 (13:07 -0700)]
am
08f077ee: am
067c6202: am
74d4652e: am
e64cfc1c: am
b79d90eb: Merge "Log when the native trace is unavailable"
* commit '
08f077ee1905ea0861717c34205a463eaa1cd76a':
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
The Android Open Source Project [Thu, 20 Sep 2012 19:52:41 +0000 (12:52 -0700)]
am
50e62906: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
50e6290628264678012d2b21b7edd10f574e26dc':
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 [Wed, 19 Sep 2012 22:20:19 +0000 (15:20 -0700)]
am
1f92cd44: am
b3667a19: Log when the native trace is unavailable
* commit '
1f92cd44579fcedc9890070f60b7f4788916e5ab':
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 23:01:29 +0000 (16:01 -0700)]
am
296434b9: am
86913b6b: am
90f12e0b: am
4535e29e: am
a177aa50: Merge "Use 0xde as the poison value after JIT code cache reset."
* commit '
296434b978ca36ce69423ce0be8c40606f76b8f9':
Use 0xde as the poison value after JIT code cache reset.
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: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 21:53:53 +0000 (14:53 -0700)]
am
0af02f68: am
ae341c38: Merge "Use 0xde as the poison value after JIT code cache reset." into jb-mr1-dev
* commit '
0af02f688452999425819766d3c1fa5b7c7db78c':
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
Elliott Hughes [Mon, 17 Sep 2012 18:29:30 +0000 (11:29 -0700)]
am
805a3871: am
dde72bb4: am
8e80f76a: am
d207be35: am
f31a0600: Merge "Optimize those StrictMath routines that are identical to Math routines."
* commit '
805a38718b7e747c26a4e4940d60d4acd8cbe7b0':
Optimize those StrictMath routines that are identical to Math routines.
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: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 [Thu, 13 Sep 2012 00:02:34 +0000 (17:02 -0700)]
am
ef30b9b9: am
c524d17c: Merge "Missing EMULATED_STORAGE_TARGET isn\'t an error." into jb-mr1-dev
* commit '
ef30b9b908dc6d1fc499dc2ca10efc4ed07fffd8':
Missing EMULATED_STORAGE_TARGET isn't an error.
The Android Open Source Project [Wed, 12 Sep 2012 23:59:27 +0000 (16:59 -0700)]
am
34d6b0a3: (-s ours) am
acc6d354: am
91a17e5e: (-s ours) Reconcile with jb-release - do not merge
* commit '
34d6b0a307c404e88b23b69f0296f86faf6a20d2':
Test if new build is kicked off.
The Android Open Source Project [Wed, 12 Sep 2012 23:58:51 +0000 (16:58 -0700)]
am
a7c46703: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a7c46703e672522d41e6f1e2b8ac8e44b84df463':
Jeff Sharkey [Wed, 12 Sep 2012 23:43:27 +0000 (16:43 -0700)]
am
57fa797a: am
d8de46c4: Include user identifier in external storage paths.
* commit '
57fa797a8b71ec752605f83a237d409dab2a972e':
Include user identifier in external storage paths.
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: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
The Android Open Source Project [Thu, 6 Sep 2012 16:12:37 +0000 (09:12 -0700)]
am
fd1c8ee2: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
fd1c8ee2d601140bf25172be3232c6262dae3f0c':
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:08:08 +0000 (18:08 -0700)]
am
b9b46a96: am
21c93dc7: Remove /sdcard hack for shell users.
* commit '
b9b46a963335146effbe1ee3353a426509c9f51d':
Remove /sdcard hack for shell users.
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:56:23 +0000 (07:56 -0700)]
am
01831860: am
aa5ba914: am
e599c468: am
cfeacbdd: Merge "Remove unnecessary compiler pragma."
* commit '
01831860d8ca617757a4449a01b6e79d5a71eaeb':
Remove unnecessary compiler pragma.
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:03:56 +0000 (01:03 -0700)]
am
1a3105a8: am
2004e4eb: am
86e036a8: am
e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."
* commit '
1a3105a8978aa20494b672a3151816e7fa3b8c2c':
Fix an ugly bug where try/catch offsets weren't being mapped properly.
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:44:29 +0000 (00:44 -0700)]
am
2f947d97: am
b760cb53: am
93ee4913: am
f3b60d2f: Merge "Fix a bug where the max blowup of annotations was incorrect."
* commit '
2f947d976333b7242d9462cfb81d21855d13286e':
Fix a bug where the max blowup of annotations was incorrect.
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
Jeff Sharkey [Thu, 30 Aug 2012 17:52:18 +0000 (10:52 -0700)]
am
531a9fa1: am
a018360c: Merge "Access to all users\' external storage." into jb-mr1-dev
* commit '
531a9fa16ebb01f22003f23627272d715bd9c84a':
Access to all users' external storage.
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:35:23 +0000 (10:35 -0700)]
am
92554426: am
e66f926b: Merge "Shared OBB storage across users." into jb-mr1-dev
* commit '
92554426bd735c733587a544791ed18b99b72137':
Shared OBB storage across users.
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.
Jeff Sharkey [Thu, 30 Aug 2012 17:28:52 +0000 (10:28 -0700)]
Merge "Shared OBB storage across users." into jb-mr1-dev
The Android Automerger [Thu, 30 Aug 2012 13:33:23 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Elliott Hughes [Wed, 29 Aug 2012 23:40:15 +0000 (16:40 -0700)]
am
fa49142d: am
f646cb9e: am
8e98f776: am
3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
* commit '
fa49142d08d07d1ebd0fcc8da51cc78ca26d4308':
Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
Elliott Hughes [Wed, 29 Aug 2012 23:38:05 +0000 (16:38 -0700)]
am
f646cb9e: am
8e98f776: am
3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
* commit '
f646cb9e717e4937255ae8bd72bed212b275de44':
Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
Elliott Hughes [Wed, 29 Aug 2012 23:35:42 +0000 (16:35 -0700)]
am
8e98f776: am
3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
* commit '
8e98f7761d88d0230305d1855e4f418fe3554398':
Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
Elliott Hughes [Wed, 29 Aug 2012 23:31:07 +0000 (16:31 -0700)]
am
3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
* commit '
3e46814d8984243612176c9b15d8d012dcca2143':
Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
Elliott Hughes [Wed, 29 Aug 2012 23:24:47 +0000 (16:24 -0700)]
Merge "Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."
Elliott Hughes [Wed, 29 Aug 2012 22:46:18 +0000 (15:46 -0700)]
Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
dalvikvm --help would fail here:
#0 __pthread_mutex_destroy (mutex=0x0) at pthread_mutex_destroy.c:28
#1 0xf7b36e13 in dvmDestroyMutex (pMutex=0x0) at dalvik/vm/Thread.h:465
#2 dvmQuasiAtomicsShutdown () at dalvik/vm/Atomic.cpp:188
#3 0xf7b65781 in dvmShutdown () at dalvik/vm/Init.cpp:1889
#4 0xf7b65f31 in ~ScopedShutdown (this=<synthetic pointer>, __in_chrg=<optimized out>) at dalvik/vm/Init.cpp:1317
#5 dvmStartup (argc=11, argv=0x804b360, ignoreUnrecognized=false, pEnv=0x804b398) at dalvik/vm/Init.cpp:1548
#6 0xf7b790e2 in JNI_CreateJavaVM (p_vm=0xffffc758, p_env=0xffffc75c, vm_args=0xffffc760) at dalvik/vm/Jni.cpp:3502
#7 0x08048958 in main (argc=13, argv=0xffffc8b8) at dalvik/dalvikvm/Main.cpp:212
Change-Id: I8c833ca5ea454d9b2d1714a569fb728562088659
Ian Rogers [Wed, 29 Aug 2012 21:07:21 +0000 (14:07 -0700)]
Remove unnecessary compiler pragma.
With dlmalloc 2.8.6 the compiler pragmas to suppress warnings are not
necessary.
Remove unnecessary dlmalloc dl prefix #define.
Depends upon: https://android-review.googlesource.com/42351
Change-Id: Idc45cee9342efec0aab63d5172b3308a0fca3c4f
Ian Rogers [Wed, 29 Aug 2012 15:59:16 +0000 (08:59 -0700)]
am
6e14c250: am
2f30ef57: Revert "Revert "Trim pre-Zygote fork, fix under-estimate of heap limit.""
* commit '
6e14c250d6bf1b9ef32e3b1bcba4c7fb9b9e7cf4':
Revert "Revert "Trim pre-Zygote fork, fix under-estimate of heap limit.""
Ian Rogers [Wed, 29 Aug 2012 15:59:15 +0000 (08:59 -0700)]
am
6c4ad86d: am
808a7c0e: Revert "Revert "Upgrade to dlmalloc 2.8.5.""
* commit '
6c4ad86d11ec0ac2bf787e6912918757b57b378d':
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
Ian Rogers [Wed, 29 Aug 2012 15:56:52 +0000 (08:56 -0700)]
am
2f30ef57: Revert "Revert "Trim pre-Zygote fork, fix under-estimate of heap limit.""
* commit '
2f30ef57ceb02ee5d6719d2158bd9bca4723687d':
Revert "Revert "Trim pre-Zygote fork, fix under-estimate of heap limit.""
Ian Rogers [Wed, 29 Aug 2012 15:56:51 +0000 (08:56 -0700)]
am
808a7c0e: Revert "Revert "Upgrade to dlmalloc 2.8.5.""
* commit '
808a7c0e7e39b7ca3c7db1366e6e4089166052bb':
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
The Android Automerger [Wed, 29 Aug 2012 13:33:22 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Sharkey [Tue, 28 Aug 2012 23:23:22 +0000 (16:23 -0700)]
Access to all users' external storage.
System services holding this permission have external storage bound
one level higher, giving them access to all users' files.
Bug:
7003520
Change-Id: Id95d6d5b2fa2ff75c0c94f18f81cb118f837f665
Ian Rogers [Tue, 28 Aug 2012 22:54:19 +0000 (15:54 -0700)]
Revert "Revert "Trim pre-Zygote fork, fix under-estimate of heap limit.""
This reverts commit
4c7e27186d87ccd40646fd4f514dc982ff5b40b1.
Ian Rogers [Tue, 28 Aug 2012 22:54:09 +0000 (15:54 -0700)]
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
This reverts commit
729eebbb4e4ec5b826b7230b4c02267da341b70b.
Jeff Sharkey [Mon, 27 Aug 2012 22:47:24 +0000 (15:47 -0700)]
Shared OBB storage across users.
To avoid downloading large OBB files separately for each user,
provide a shared view of /sdcard/Android/obb to all apps. This new
shared view is read-only by default, but it's mounted writable if
an app requests the WRITE_EXTERNAL_OBB_STORAGE permission.
Bug:
7008879
Change-Id: Ibc6a3dbf360bf1b9d356bf52595201d155ff73b8
Jean-Philippe Lesot [Tue, 28 Aug 2012 20:01:59 +0000 (13:01 -0700)]
am
3a834bb0: am
a78e89c8: am
4014e152: am
a5731795: Merge "Correctly handle switches on values in a high register"
* commit '
3a834bb03f412cf0082dbff0102165f0da828d4c':
Correctly handle switches on values in a high register
Jean-Philippe Lesot [Tue, 28 Aug 2012 17:08:10 +0000 (10:08 -0700)]
am
a78e89c8: am
4014e152: am
a5731795: Merge "Correctly handle switches on values in a high register"
* commit '
a78e89c828cbb8a6befecf6c703612309b85d448':
Correctly handle switches on values in a high register
Jean-Philippe Lesot [Tue, 28 Aug 2012 17:06:20 +0000 (10:06 -0700)]
am
4014e152: am
a5731795: Merge "Correctly handle switches on values in a high register"
* commit '
4014e152c86a0a6929382f8ac767d572ada21042':
Correctly handle switches on values in a high register