OSDN Git Service
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 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.""
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.
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
Jean-Philippe Lesot [Tue, 28 Aug 2012 17:01:52 +0000 (10:01 -0700)]
am
a5731795: Merge "Correctly handle switches on values in a high register"
* commit '
a57317952de3fc37876f97e8655cc773b97df891':
Correctly handle switches on values in a high register
Jean-Philippe Lesot [Tue, 28 Aug 2012 16:58:20 +0000 (09:58 -0700)]
Merge "Correctly handle switches on values in a high register"
Elliott Hughes [Mon, 27 Aug 2012 22:24:51 +0000 (15:24 -0700)]
am
6fc13d33: am
46f57f4d: am
cc686898: am
f6104618: Merge "Fix a bug where debugInfos\' size wasn\'t being computed."
* commit '
6fc13d33af19fbec037d54d9d7543652c88c445a':
Fix a bug where debugInfos' size wasn't being computed.
Elliott Hughes [Mon, 27 Aug 2012 22:21:25 +0000 (15:21 -0700)]
am
46f57f4d: am
cc686898: am
f6104618: Merge "Fix a bug where debugInfos\' size wasn\'t being computed."
* commit '
46f57f4da2f75daadda008d28f9199f9e971f087':
Fix a bug where debugInfos' size wasn't being computed.
Elliott Hughes [Mon, 27 Aug 2012 22:17:33 +0000 (15:17 -0700)]
am
cc686898: am
f6104618: Merge "Fix a bug where debugInfos\' size wasn\'t being computed."
* commit '
cc68689852b84b244ca393d748836f54cae5b5a7':
Fix a bug where debugInfos' size wasn't being computed.
Elliott Hughes [Mon, 27 Aug 2012 22:13:56 +0000 (15:13 -0700)]
am
f6104618: Merge "Fix a bug where debugInfos\' size wasn\'t being computed."
* commit '
f610461867348df0c5a624d75f39b34071044fb2':
Fix a bug where debugInfos' size wasn't being computed.
Elliott Hughes [Mon, 27 Aug 2012 21:57:24 +0000 (14:57 -0700)]
Merge "Fix a bug where debugInfos' size wasn't being computed."
The Android Open Source Project [Sat, 25 Aug 2012 14:18:35 +0000 (07:18 -0700)]
am
b1452579: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
b1452579d000f56b078c1cc537f0028fe9224b61':
One more errno for encrypted devices.
The Android Open Source Project [Sat, 25 Aug 2012 14:15:38 +0000 (07:15 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib08f0574bce5b926a38d9a0fd428da003e7cf2c3
Ian Rogers [Fri, 24 Aug 2012 17:38:42 +0000 (10:38 -0700)]
am
59d9999f: am
fc2d0f2a: am
f76ab40f: am
ecda5d85: Merge "Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test"
* commit '
59d9999f713cabe68db8c75e5436a8bb2f992b7e':
Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test
Ian Rogers [Fri, 24 Aug 2012 17:37:38 +0000 (10:37 -0700)]
am
fc2d0f2a: am
f76ab40f: am
ecda5d85: Merge "Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test"
* commit '
fc2d0f2a17167756d0e4a03c3de9f63f8f301674':
Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test
Ian Rogers [Fri, 24 Aug 2012 17:35:51 +0000 (10:35 -0700)]
am
f76ab40f: am
ecda5d85: Merge "Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test"
* commit '
f76ab40f7065b4e0202b83b8a7a0c4175d695801':
Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test
Ian Rogers [Fri, 24 Aug 2012 17:33:41 +0000 (10:33 -0700)]
am
ecda5d85: Merge "Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test"
* commit '
ecda5d8585466d63f185ff09047643e9bd9cb261':
Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test
Ian Rogers [Fri, 24 Aug 2012 17:15:37 +0000 (10:15 -0700)]
Merge "Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test"
Ian Rogers [Fri, 24 Aug 2012 16:53:41 +0000 (09:53 -0700)]
am
58061316: am
4c7e2718: Revert "Trim pre-Zygote fork, fix under-estimate of heap limit."
* commit '
58061316e797a1e92c82f6ea17b294aae0c3ddae':
Revert "Trim pre-Zygote fork, fix under-estimate of heap limit."
Ian Rogers [Fri, 24 Aug 2012 16:52:20 +0000 (09:52 -0700)]
am
4c7e2718: Revert "Trim pre-Zygote fork, fix under-estimate of heap limit."
* commit '
4c7e27186d87ccd40646fd4f514dc982ff5b40b1':
Revert "Trim pre-Zygote fork, fix under-estimate of heap limit."
Ian Rogers [Fri, 24 Aug 2012 16:40:26 +0000 (09:40 -0700)]
Revert "Trim pre-Zygote fork, fix under-estimate of heap limit."
This reverts commit
2f8d5e11f735e9ee8e235c31b3f113f6c90ad63c.
Brian Carlstrom [Fri, 24 Aug 2012 14:38:46 +0000 (07:38 -0700)]
am
08f68eb5: am
f314511b: am
6464661f: am
b48569ac: Merge "Fix build warning."
* commit '
08f68eb5975ba1f2a66ac58a18cd0d40c360ee16':
Fix build warning.
Ian Rogers [Fri, 24 Aug 2012 14:38:45 +0000 (07:38 -0700)]
am
8a03fcfc: am
df6983ae: am
bd561cbf: am
a9dd9337: Merge "Trim pre-Zygote fork, fix under-estimate of heap limit."
* commit '
8a03fcfcf58d511b898147daf24fa21fd9f6bdcd':
Trim pre-Zygote fork, fix under-estimate of heap limit.
Brian Carlstrom [Fri, 24 Aug 2012 14:34:31 +0000 (07:34 -0700)]
am
f314511b: am
6464661f: am
b48569ac: Merge "Fix build warning."
* commit '
f314511baafba3a20d370d8128931c1586948eb2':
Fix build warning.
Ian Rogers [Fri, 24 Aug 2012 14:34:30 +0000 (07:34 -0700)]
am
df6983ae: am
bd561cbf: am
a9dd9337: Merge "Trim pre-Zygote fork, fix under-estimate of heap limit."
* commit '
df6983ae4d02247277502479179167aa64d94a4f':
Trim pre-Zygote fork, fix under-estimate of heap limit.
Brian Carlstrom [Fri, 24 Aug 2012 14:30:34 +0000 (07:30 -0700)]
am
6464661f: am
b48569ac: Merge "Fix build warning."
* commit '
6464661ff5ca7dd83f60f68e7b40af0ed3ec8760':
Fix build warning.
Ian Rogers [Fri, 24 Aug 2012 14:29:48 +0000 (07:29 -0700)]
am
bd561cbf: am
a9dd9337: Merge "Trim pre-Zygote fork, fix under-estimate of heap limit."
* commit '
bd561cbffebbff1a8b17e031841ab2fcd2777cff':
Trim pre-Zygote fork, fix under-estimate of heap limit.
Brian Carlstrom [Fri, 24 Aug 2012 03:35:43 +0000 (20:35 -0700)]
am
b48569ac: Merge "Fix build warning."
* commit '
b48569acbb7b3702f1071befa5ebfeae7a46303b':
Fix build warning.
Brian Carlstrom [Fri, 24 Aug 2012 03:20:47 +0000 (20:20 -0700)]
Merge "Fix build warning."
Ying Wang [Thu, 23 Aug 2012 18:12:12 +0000 (11:12 -0700)]
Fix build warning.
Change-Id: I1f9813c9dc1dfc388f82f37584fe60256b6a8b12
Jeff Sharkey [Thu, 23 Aug 2012 17:32:20 +0000 (10:32 -0700)]
One more errno for encrypted devices.
Bug:
7017585
Change-Id: I4c2cc95a5c3a44bab4a93f3a1f8907869f0ce8e6
Ian Rogers [Thu, 23 Aug 2012 20:48:25 +0000 (13:48 -0700)]
am
a9dd9337: Merge "Trim pre-Zygote fork, fix under-estimate of heap limit."
* commit '
a9dd9337605a610841c86fe1bd90a8fa9b8d28c9':
Trim pre-Zygote fork, fix under-estimate of heap limit.
Ian Rogers [Thu, 23 Aug 2012 20:35:23 +0000 (13:35 -0700)]
Merge "Trim pre-Zygote fork, fix under-estimate of heap limit."
Ying Wang [Thu, 23 Aug 2012 18:54:09 +0000 (11:54 -0700)]
am
eba1a36f: (-s ours) am
42106ef4: Merge "Fix build warning." into jb-mr1-dev
* commit '
eba1a36fd7caef8b4ea7e05f07c922f0cfc9bfca':
Fix build warning.
Jeff Sharkey [Thu, 23 Aug 2012 18:44:13 +0000 (11:44 -0700)]
am
1a90101b: am
af02f574: One more errno for encrypted devices.
* commit '
1a90101b3f9c88109dfd01fbff3be764a7bd4646':
One more errno for encrypted devices.
Mathieu Chartier [Wed, 22 Aug 2012 01:14:19 +0000 (18:14 -0700)]
Fix for
6994917 GC is slower since JOO33B per FrameworkPerf test
Fixes the GC aspect of the regression in FrameworkTest for Gc.
Large bitmap test seems to be unaffected.
Changes are:
We now have minimum sleep of 1ms instead of 10ms in dvmSuspendAll.
Some heuristics to avoid doing extra GCs if an allocation waited for a concurrent Gc.
Change-Id: I3797c7dc813e26bd1f7bb0a9dbe55eb70dd1c9c9
Ying Wang [Thu, 23 Aug 2012 18:29:07 +0000 (11:29 -0700)]
am
42106ef4: Merge "Fix build warning." into jb-mr1-dev
* commit '
42106ef49501a0c72cda9e80b81e82b8254390ab':
Fix build warning.
Ying Wang [Thu, 23 Aug 2012 18:27:01 +0000 (11:27 -0700)]
Merge "Fix build warning." into jb-mr1-dev
Ying Wang [Thu, 23 Aug 2012 18:12:12 +0000 (11:12 -0700)]
Fix build warning.
Change-Id: I1f9813c9dc1dfc388f82f37584fe60256b6a8b12
Jeff Sharkey [Thu, 23 Aug 2012 17:54:32 +0000 (10:54 -0700)]
am
af02f574: One more errno for encrypted devices.
* commit '
af02f57404b28590b34fa3777a381c13e3c956eb':
One more errno for encrypted devices.
Jeff Sharkey [Thu, 23 Aug 2012 17:32:20 +0000 (10:32 -0700)]
One more errno for encrypted devices.
Bug:
7017585
Change-Id: I4c2cc95a5c3a44bab4a93f3a1f8907869f0ce8e6
The Android Automerger [Thu, 23 Aug 2012 13:33:29 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Wilson [Thu, 23 Aug 2012 06:20:26 +0000 (23:20 -0700)]
Fix a bug where debugInfos' size wasn't being computed.
Previously debugInfos' size of 0 caused a malformed dex file
because debug data was present but not mentioned in the table
of contents.
Change-Id: I07171aaee12fef9f303fc505909f44ef1a714114
Ian Rogers [Thu, 23 Aug 2012 05:14:32 +0000 (22:14 -0700)]
Trim pre-Zygote fork, fix under-estimate of heap limit.
Card scanning uses dvmHeapSourceGetValue to scan from the heap base to
the total foot print of the heap. Trimming the Zygote may lower the
footprint of the heap by creating a hole in the middle. This hole is
unaccounted for in the card scanning leading to missed dirty cards.
This was a regression introduced by:
https://android-review.googlesource.com/#/c/41728/
as it didn't #define MORECORE_CANNOT_TRIM 1 that was previously defined
here:
https://android-review.googlesource.com/#/c/41731/4/libcutils/mspace.c
Introduce a notion of dvmHeapSourceGetLimit so that card scanning
doesn't rely on footprint. Trim the heap before forking the Zygote. This
change continues to enable morecore trimming of mspaces.
Change-Id: I3f0b12371097f50a1f920cac25846ca08685e7ed
Ben Gruver [Thu, 23 Aug 2012 01:45:25 +0000 (18:45 -0700)]
Correctly handle switches on values in a high register
When dx generates a switch on a value in a high register, it prepends a move
instruction, to move the value to a low register. However, this causes the
switch data pseudo-instruction to use address of the move instruction as the
base address of the switch targets, rather than the address of the switch
instruction
Change-Id: I0708d35ec3059c30221cd0a64f426244411d31ea
Jeff Sharkey [Thu, 23 Aug 2012 01:21:07 +0000 (18:21 -0700)]
am
40d3cc61: am
b88891a2: Merge "Iteration on multi-user external storage." into jb-mr1-dev
* commit '
40d3cc6171fcc9e550d4265306410d1ec42b2b7e':
Iteration on multi-user external storage.
Jeff Sharkey [Thu, 23 Aug 2012 01:19:01 +0000 (18:19 -0700)]
am
b88891a2: Merge "Iteration on multi-user external storage." into jb-mr1-dev
* commit '
b88891a2f40a47aef0cab76dc5b696812359f8bb':
Iteration on multi-user external storage.
Jeff Sharkey [Thu, 23 Aug 2012 01:17:30 +0000 (18:17 -0700)]
Merge "Iteration on multi-user external storage." into jb-mr1-dev
Jeff Sharkey [Wed, 22 Aug 2012 21:08:31 +0000 (14:08 -0700)]
Iteration on multi-user external storage.
Zygote now mounts a tmpfs over any existing /storage contents, giving
it a clean slate for its bind mounts. This supports a symlink that
enables legacy /sdcard paths for shell users. Move to using paths
defined from environment variables, instead of header files.
Bug:
6925012
Change-Id: Ia4a2ac35ecfe98b617c27ff3bd73deb29e395e55
The Android Open Source Project [Wed, 22 Aug 2012 22:37:25 +0000 (15:37 -0700)]
am
3cfa40b4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
3cfa40b4afbaebc80810b0efaa3763d8af0d040c':
Revert "Upgrade to dlmalloc 2.8.5."
Revert "Ensure we fence the writing of clazz to an Object post allocation."
The Android Open Source Project [Wed, 22 Aug 2012 22:34:44 +0000 (15:34 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I3fe6509183beaa0dab8b3525d5bd70c7f5fd84c1
Brian Carlstrom [Wed, 22 Aug 2012 19:11:40 +0000 (12:11 -0700)]
Revert "Upgrade to dlmalloc 2.8.5."
This reverts commit
bba37bd191843ef29ef9c7a8839e98b73debfffa.
Brian Carlstrom [Wed, 22 Aug 2012 19:11:29 +0000 (12:11 -0700)]
Revert "Ensure we fence the writing of clazz to an Object post allocation."
This reverts commit
821ab588af4566a800d4b5608092ccc1dd3764af.
Brian Carlstrom [Wed, 22 Aug 2012 20:57:51 +0000 (13:57 -0700)]
am
729eebbb: Revert "Upgrade to dlmalloc 2.8.5."
* commit '
729eebbb4e4ec5b826b7230b4c02267da341b70b':
Revert "Upgrade to dlmalloc 2.8.5."
Brian Carlstrom [Wed, 22 Aug 2012 20:57:50 +0000 (13:57 -0700)]
am
3b93aad3: Revert "Ensure we fence the writing of clazz to an Object post allocation."
* commit '
3b93aad3e70c0b369ce922d92e5ab154320c401c':
Revert "Ensure we fence the writing of clazz to an Object post allocation."
Brian Carlstrom [Wed, 22 Aug 2012 19:11:40 +0000 (12:11 -0700)]
Revert "Upgrade to dlmalloc 2.8.5."
This reverts commit
bba37bd191843ef29ef9c7a8839e98b73debfffa.
Brian Carlstrom [Wed, 22 Aug 2012 19:11:29 +0000 (12:11 -0700)]
Revert "Ensure we fence the writing of clazz to an Object post allocation."
This reverts commit
821ab588af4566a800d4b5608092ccc1dd3764af.
Ian Rogers [Wed, 22 Aug 2012 00:58:48 +0000 (17:58 -0700)]
am
821ab588: Ensure we fence the writing of clazz to an Object post allocation.
* commit '
821ab588af4566a800d4b5608092ccc1dd3764af':
Ensure we fence the writing of clazz to an Object post allocation.
Ian Rogers [Wed, 22 Aug 2012 00:26:13 +0000 (17:26 -0700)]
Ensure we fence the writing of clazz to an Object post allocation.
We hold the heap lock during the calloc of an object in the GCed heap.
We do a non-volatile store following this for the clazz, this may lead to a
race where an object is allocated but appears to have no clazz.
Found investigating Bug:
7028104
Change-Id: I390ad4c7b9632127bd27393742be347b84d9269a
Brian Carlstrom [Mon, 20 Aug 2012 23:33:15 +0000 (16:33 -0700)]
am
a20bc3ba: am
1129f6a7: am
b931f906: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
a20bc3bada66210e4fb76352bf29cb3c2b41f7b3':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:29:58 +0000 (16:29 -0700)]
am
1129f6a7: am
b931f906: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
1129f6a78708a8d8861f8053616c3961aefdc1ef':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:28:17 +0000 (16:28 -0700)]
am
b931f906: Merge "Upgrade to dlmalloc 2.8.5."
* commit '
b931f9065990520bf34b8c6128e069b4cca4a7ec':
Upgrade to dlmalloc 2.8.5.
Brian Carlstrom [Mon, 20 Aug 2012 23:12:37 +0000 (16:12 -0700)]
Merge "Upgrade to dlmalloc 2.8.5."
Ian Rogers [Sat, 18 Aug 2012 00:01:51 +0000 (17:01 -0700)]
Upgrade to dlmalloc 2.8.5.
Switch to using dlmalloc 2.8.5. Define mspace functionality directly
using dlmalloc rather than taking from libcutils.
Remove growth limit check in tryMalloc that only checks initial growth
limit.
Implement trimming at the end of the mspace.
Depends upon: https://android-review.googlesource.com/41717
Change-Id: Ia2c6b50bdb0b0d5aae4b18deefbd1bf50dfa49d5
Joe Onorato [Sun, 22 Jul 2012 00:33:46 +0000 (17:33 -0700)]
Unnessary LOCAL_MODULE_TAGS
Change-Id: I77b9b58180f7036ae8873ae2511e664eeb3b5f05
Jeff Sharkey [Thu, 16 Aug 2012 21:40:18 +0000 (14:40 -0700)]
am
15e3b32a: Merge "Multi-user external storage support." into jb-mr1-dev
* commit '
15e3b32a0a6dd9788ce2a5fad07600b8aa26fb38':
Multi-user external storage support.
Jeff Sharkey [Thu, 16 Aug 2012 21:32:58 +0000 (14:32 -0700)]
Merge "Multi-user external storage support." into jb-mr1-dev
Jeff Sharkey [Sat, 11 Aug 2012 21:11:44 +0000 (14:11 -0700)]
Multi-user external storage support.
When a specialized zygote process needs external storage access,
create a private mount namespace and create a bind mount to give
them access. Support both single-user and multi-user modes, which
dictate the bind mount source.
Bug:
6925012
Change-Id: Ib987ba09f59ce03a6aeb9ee8bcb522965a2dfb67
Elliott Hughes [Mon, 13 Aug 2012 18:49:19 +0000 (11:49 -0700)]
am
55e323d4: am
031072f0: am
57573862: Merge "hardening: eliminate all text relocations from lidbvm"
* commit '
55e323d4a2d794dc3b00c34fc05602647591da39':
hardening: eliminate all text relocations from lidbvm
Elliott Hughes [Mon, 13 Aug 2012 18:44:02 +0000 (11:44 -0700)]
am
031072f0: am
57573862: Merge "hardening: eliminate all text relocations from lidbvm"
* commit '
031072f007d3ffd0d2facd6277005f2dac93c19c':
hardening: eliminate all text relocations from lidbvm
Elliott Hughes [Mon, 13 Aug 2012 18:40:32 +0000 (11:40 -0700)]
am
57573862: Merge "hardening: eliminate all text relocations from lidbvm"
* commit '
57573862ca6b377c73958d5ba876a406445b4490':
hardening: eliminate all text relocations from lidbvm
Elliott Hughes [Mon, 13 Aug 2012 18:25:22 +0000 (11:25 -0700)]
Merge "hardening: eliminate all text relocations from lidbvm"
Ard Biesheuvel [Sat, 11 Aug 2012 10:45:01 +0000 (12:45 +0200)]
hardening: eliminate all text relocations from lidbvm
This patch consists of:
- changes to mterp/ that turn all literals from absolute
to PC relative, so the relocations can be resolved at
(build) link time
- changes to compiler/template/ that result in the
compiler templates to live in the non-executable
.data.rel.ro section (this code is never executed
directly, only from the jit heap, so there is no
reason to put it in the .text section)
Change-Id: I2dc97bd4720b393a74b7277a188f0c7b681fc932
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
Ying Wang [Sat, 11 Aug 2012 00:34:49 +0000 (17:34 -0700)]
We are avoiding LOCAL_CFLAGS when compiling assembly code.
Bug:
6967574
Change-Id: Ia696b884cf50e943ae969b377f122e4d5d8f7776
Elliott Hughes [Tue, 7 Aug 2012 01:38:14 +0000 (18:38 -0700)]
am
219a3f5f: am
21212cbd: Merge "Fix ALOGV bit rot."
* commit '
219a3f5fdb4a8b85646037e2c09b3c7e408b1ec8':
Fix ALOGV bit rot.
Elliott Hughes [Tue, 7 Aug 2012 01:36:44 +0000 (18:36 -0700)]
am
21212cbd: Merge "Fix ALOGV bit rot."
* commit '
21212cbd65aa7ec7d69f0c6f5b98794045f750a5':
Fix ALOGV bit rot.
Elliott Hughes [Tue, 7 Aug 2012 01:34:10 +0000 (18:34 -0700)]
Merge "Fix ALOGV bit rot."
Elliott Hughes [Tue, 7 Aug 2012 00:40:02 +0000 (17:40 -0700)]
Fix ALOGV bit rot.
Change-Id: Ia182af8f5ca3967a21003b3d1513145f8e6e5db0
Elliott Hughes [Mon, 6 Aug 2012 17:34:30 +0000 (10:34 -0700)]
am
aa1d0261: am
464388e8: Merge "Don\'t crash on invalid string/type ids."
* commit '
aa1d026167c9024bf08784527b5c4176ee8c6523':
Don't crash on invalid string/type ids.
Elliott Hughes [Mon, 6 Aug 2012 17:33:05 +0000 (10:33 -0700)]
am
464388e8: Merge "Don\'t crash on invalid string/type ids."
* commit '
464388e8756d362f91d110b5741ba785ea3d44bd':
Don't crash on invalid string/type ids.
Elliott Hughes [Mon, 6 Aug 2012 17:27:35 +0000 (10:27 -0700)]
Merge "Don't crash on invalid string/type ids."
Elliott Hughes [Mon, 6 Aug 2012 17:14:12 +0000 (10:14 -0700)]
am
74f9cd03: am
8fb8c4de: Merge "RETURN_VOID_BARRIER is also a return."
* commit '
74f9cd03d837538d311cc068bdd31cfd66eb014c':
RETURN_VOID_BARRIER is also a return.
Elliott Hughes [Mon, 6 Aug 2012 16:59:50 +0000 (09:59 -0700)]
am
8fb8c4de: Merge "RETURN_VOID_BARRIER is also a return."
* commit '
8fb8c4de25c5c95019a06b37f17bb6d82b41f4ac':
RETURN_VOID_BARRIER is also a return.
Elliott Hughes [Mon, 6 Aug 2012 16:51:21 +0000 (09:51 -0700)]
Don't crash on invalid string/type ids.
Bug: http://code.google.com/p/android/issues/detail?id=35934
Change-Id: I7bf31f6c80c794beb3554ad2f60ed5ebbca0c65e
Elliott Hughes [Mon, 6 Aug 2012 16:34:31 +0000 (09:34 -0700)]
Merge "RETURN_VOID_BARRIER is also a return."
Elliott Hughes [Mon, 6 Aug 2012 16:16:08 +0000 (09:16 -0700)]
RETURN_VOID_BARRIER is also a return.
Bug: http://code.google.com/p/android/issues/detail?id=36003
Change-Id: I7fb53b0898158a3ad7b0eb4f8385674ddaeffd60
Brian Carlstrom [Fri, 3 Aug 2012 00:57:26 +0000 (17:57 -0700)]
am
93018cdc: am
0b79e282: Merge "Change dalvik script to use exec"
* commit '
93018cdcc6d419b19587ad2e6622284a4b72742c':
Change dalvik script to use exec
Brian Carlstrom [Fri, 3 Aug 2012 00:55:33 +0000 (17:55 -0700)]
am
0b79e282: Merge "Change dalvik script to use exec"
* commit '
0b79e2824eeb763ea82aa8ff544ef7b20ea7fdd5':
Change dalvik script to use exec
Brian Carlstrom [Fri, 3 Aug 2012 00:36:55 +0000 (17:36 -0700)]
Merge "Change dalvik script to use exec"