The Android Automerger
0f01df7fc9
merge in jb-mr2-release history after reset to master
2013-01-25 07:10:05 -08:00
Nick Kralevich
ddbb728eff
am 151e91e6
: am da2d2c61
: am 82ef8296
: Merge "prctl.h: include sys/cdefs.h"
...
# Via Android Git Automerger (2) and others
* commit '151e91e66c95a7e415903b87b8157a9bc422df45':
prctl.h: include sys/cdefs.h
2013-01-24 16:15:39 -08:00
Nick Kralevich
151e91e66c
am da2d2c61
: am 82ef8296
: Merge "prctl.h: include sys/cdefs.h"
...
# Via Android Git Automerger (1) and others
* commit 'da2d2c618c23f212f8dec0c0615bf75d7c18b88d':
prctl.h: include sys/cdefs.h
2013-01-24 16:11:56 -08:00
Nick Kralevich
da2d2c618c
am 82ef8296
: Merge "prctl.h: include sys/cdefs.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '82ef8296dc5e25b9cc8e7231f9515f50185dac9d':
prctl.h: include sys/cdefs.h
2013-01-24 08:59:00 -08:00
Nick Kralevich
82ef8296dc
Merge "prctl.h: include sys/cdefs.h"
2013-01-24 16:44:59 +00:00
Nick Kralevich
8e70b0d5c3
prctl.h: include sys/cdefs.h
...
prctl.h uses __BEGIN_DECLS but fails to include sys/cdefs.h
(where it's defined). Code which includes prctl.h without
previously including sys/cdefs.h will fail to compile.
Fixed.
Change-Id: If4c9f3308f08b93596dcd00e351ae786807e9320
2013-01-23 16:49:47 -08:00
Nick Kralevich
472fdc95a6
am b8726037
: am e7d937b5
: am b3351f12
: Merge "libc: use more secure system properties if available"
...
* commit 'b8726037ee1100e2704e90d0a54ea2313bf96b00':
libc: use more secure system properties if available
2013-01-23 16:16:06 -08:00
Nick Kralevich
f5b111df06
am b8726037
: am e7d937b5
: am b3351f12
: Merge "libc: use more secure system properties if available"
...
* commit 'b8726037ee1100e2704e90d0a54ea2313bf96b00':
libc: use more secure system properties if available
2013-01-23 11:12:07 -08:00
Nick Kralevich
b8726037ee
am e7d937b5
: am b3351f12
: Merge "libc: use more secure system properties if available"
...
* commit 'e7d937b52f183ce84751701c369ffe6a4c81d033':
libc: use more secure system properties if available
2013-01-23 11:09:40 -08:00
Nick Kralevich
e7d937b52f
am b3351f12
: Merge "libc: use more secure system properties if available"
...
* commit 'b3351f12047747b603efb070069e7afdf3040335':
libc: use more secure system properties if available
2013-01-23 11:07:23 -08:00
Nick Kralevich
b3351f1204
Merge "libc: use more secure system properties if available"
2013-01-23 18:50:24 +00:00
Nick Kralevich
32417fb376
libc: use more secure system properties if available
...
Currently, system properties are passed via the environment
variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed
from parent to child. This is insecure for setuid executables,
as the environment variable can be changed by the caller.
Modify system property handling so that we get the properties
from a root owned properties file, rather than using an
environment variable. Fall back to the environment variable
if the file doesn't exist.
Bug: 8045561
Change-Id: I54f3efa98cf7d63d88788da5ce0d19e34fd7851a
2013-01-23 09:28:35 -08:00
The Android Automerger
d72183aa16
merge in jb-mr2-release history after reset to master
2013-01-23 07:10:07 -08:00
Elliott Hughes
828aaaac5e
am c08ab018
: am 40107623
: am 778a68e1
: Merge "Don\'t free anything when reporting leaks."
...
* commit 'c08ab018ad133a4e177013d79be547fd55968eac':
Don't free anything when reporting leaks.
2013-01-22 22:16:11 -08:00
Elliott Hughes
9d28f5bf4a
am ce8732b1
: am 552e02fa
: am 5c8f75ef
: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit 'ce8732b188d96f4c313d20e6be17362a508f572d':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:16:10 -08:00
Elliott Hughes
c08ab018ad
am 40107623
: am 778a68e1
: Merge "Don\'t free anything when reporting leaks."
...
* commit '40107623b05fdc2b6c61d9c885483abd3add486a':
Don't free anything when reporting leaks.
2013-01-22 22:14:32 -08:00
Elliott Hughes
ce8732b188
am 552e02fa
: am 5c8f75ef
: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit '552e02fa9c99fd234c57d756358e3208d11a13ad':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:14:31 -08:00
Elliott Hughes
40107623b0
am 778a68e1
: Merge "Don\'t free anything when reporting leaks."
...
* commit '778a68e1e57408be04806b5bfc3150aade44bcbf':
Don't free anything when reporting leaks.
2013-01-22 22:11:55 -08:00
Elliott Hughes
552e02fa9c
am 5c8f75ef
: Merge "Disable leak checking for mksh; it\'s way too leaky."
...
* commit '5c8f75ef8bd89498de1d1108efa54869a2784738':
Disable leak checking for mksh; it's way too leaky.
2013-01-22 22:11:54 -08:00
Elliott Hughes
778a68e1e5
Merge "Don't free anything when reporting leaks."
2013-01-23 06:06:21 +00:00
Elliott Hughes
5c8f75ef8b
Merge "Disable leak checking for mksh; it's way too leaky."
2013-01-23 06:05:19 +00:00
Elliott Hughes
848247a972
Don't free anything when reporting leaks.
...
We don't know that they're not going to be cleaned up by a
C++ global destructor that runs after us. This is the case with
bootanimation, for example.
Bug: 7291287
Change-Id: Iba402514d1735fdc2ae4bc95b65396d816be46c0
2013-01-22 18:36:28 -08:00
Elliott Hughes
84f8b5f401
Disable leak checking for mksh; it's way too leaky.
...
When each shell leaks ~240 allocations, you can't see the leaks from
the program you ran with "adb shell".
Bug: 7291287
Change-Id: Ib8780db72ba0114ebdb24768537da74bbb61f354
2013-01-22 18:35:14 -08:00
Elliott Hughes
28fa8e109e
am a8e0f2b9
: am b16ec162
: am 28f82b26
: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit 'a8e0f2b956b5a31311d778b478e63093bc2cac7a':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:31:20 -08:00
Elliott Hughes
a8e0f2b956
am b16ec162
: am 28f82b26
: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit 'b16ec162881110a30f665ce7bd1432ccefba60b7':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:29:01 -08:00
Elliott Hughes
b16ec16288
am 28f82b26
: Merge "Add const for first argument of sigismember for fit POSIX spec"
...
* commit '28f82b260c9076aae437dafb57193a174aef1eb3':
Add const for first argument of sigismember for fit POSIX spec
2013-01-22 17:26:45 -08:00
Elliott Hughes
28f82b260c
Merge "Add const for first argument of sigismember for fit POSIX spec"
2013-01-23 01:11:28 +00:00
Elliott Hughes
7f0976ef0e
am 5f79f75b
: am 57edf36c
: am 8d6302cd
: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '5f79f75ba6241ca9cab42e69a68d66d1ca28e031':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:36:26 -08:00
Elliott Hughes
5f79f75ba6
am 57edf36c
: am 8d6302cd
: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '57edf36c5f83fa7bcf9d8d028cde0acc7ddfadcc':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:33:24 -08:00
Elliott Hughes
57edf36c5f
am 8d6302cd
: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
...
* commit '8d6302cdcff9c53fe3ecd36ab479fdf08318c504':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
2013-01-22 15:31:26 -08:00
Elliott Hughes
774cef56ee
am ad551eaa
: am 5f7b6b83
: am 547eba0a
: Merge "Avoid overflow in memccpy."
...
* commit 'ad551eaa0429bf5085f2901c5d367e8a54b7ed16':
Avoid overflow in memccpy.
2013-01-22 15:23:53 -08:00
Elliott Hughes
bdd209561e
am 1029364e
: am e8e1f34a
: am 85597e2b
: Merge "Clean up debuggerd-related logging."
...
* commit '1029364ec5710755164ec9a7f0fe625cc184bb60':
Clean up debuggerd-related logging.
2013-01-22 15:23:49 -08:00
Elliott Hughes
0b9b068b3f
am 0dfb2eca
: am 0609c0fe
: am 7af7895e
: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '0dfb2ecaab681e27fa81462daec9882ebcf36edc':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 15:23:48 -08:00
Nick Kralevich
f27874740f
Revert "libc: make system properties more secure."
...
This reverts commit f10c5a2215
.
Bug: 8045561
2013-01-22 15:21:01 -08:00
Elliott Hughes
8d6302cdcf
Merge "Our strcoll(3) is no different from NetBSD's, so take exactly theirs."
2013-01-22 23:19:35 +00:00
Elliott Hughes
2b47307012
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
...
Change-Id: I45251047202a229f9175735ecc23c0ebcda71e8d
2013-01-22 15:10:19 -08:00
Elliott Hughes
ad551eaa04
am 5f7b6b83
: am 547eba0a
: Merge "Avoid overflow in memccpy."
...
* commit '5f7b6b8301658a834516f05e8e0a9eb4513e6e62':
Avoid overflow in memccpy.
2013-01-22 15:08:58 -08:00
Elliott Hughes
5f7b6b8301
am 547eba0a
: Merge "Avoid overflow in memccpy."
...
* commit '547eba0a63951d7db93c0542e1ecab891725b9a8':
Avoid overflow in memccpy.
2013-01-22 15:05:31 -08:00
Elliott Hughes
547eba0a63
Merge "Avoid overflow in memccpy."
2013-01-22 22:53:54 +00:00
Elliott Hughes
1029364ec5
am e8e1f34a
: am 85597e2b
: Merge "Clean up debuggerd-related logging."
...
* commit 'e8e1f34a33158290aa3bb9059e31ddc7a73ac1e6':
Clean up debuggerd-related logging.
2013-01-22 14:53:25 -08:00
Elliott Hughes
e8e1f34a33
am 85597e2b
: Merge "Clean up debuggerd-related logging."
...
* commit '85597e2b59af91be0607ed073b6574b934ed369d':
Clean up debuggerd-related logging.
2013-01-22 14:49:11 -08:00
Elliott Hughes
c51cd764a2
Avoid overflow in memccpy.
...
Just take the upstream NetBSD code.
Bug: http://code.google.com/p/android/issues/detail?id=43078
Change-Id: Ibbbde9d00e8bc6a09c9503aab2b04b4e3d1f98b0
2013-01-22 14:41:23 -08:00
Elliott Hughes
85597e2b59
Merge "Clean up debuggerd-related logging."
2013-01-22 22:37:28 +00:00
Elliott Hughes
0dfb2ecaab
am 0609c0fe
: am 7af7895e
: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '0609c0fe8dae2ec10f1811c46a4d583f557c68f7':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 14:35:06 -08:00
Elliott Hughes
0609c0fe8d
am 7af7895e
: Merge "Use the new non-allocating logging for dlmalloc failures."
...
* commit '7af7895eeb810ff1a1ca8b60fcda13595d551114':
Use the new non-allocating logging for dlmalloc failures.
2013-01-22 14:32:02 -08:00
Elliott Hughes
7af7895eeb
Merge "Use the new non-allocating logging for dlmalloc failures."
2013-01-22 22:26:35 +00:00
Elliott Hughes
ce4cf90d79
Use the new non-allocating logging for dlmalloc failures.
...
Change-Id: I88afe0201ee5766a295fc5a9e710fba9d6e0d363
2013-01-22 14:24:52 -08:00
Elliott Hughes
6b8e321e61
Clean up debuggerd-related logging.
...
Bug: 7291287
Change-Id: Ia7aa386e8b75b8058d7d9e707e11b1da7dc62f00
2013-01-22 14:17:14 -08:00
Nick Kralevich
0acf4069e9
am 98ae1a85
: am e652ed30
: am 244bee5b
: Merge "bionic_auxv.h: fix #define conflict"
...
* commit '98ae1a85b057f6534bee7e52897a80694ba8b2e1':
bionic_auxv.h: fix #define conflict
2013-01-22 13:46:31 -08:00
Nick Kralevich
98ae1a85b0
am e652ed30
: am 244bee5b
: Merge "bionic_auxv.h: fix #define conflict"
...
* commit 'e652ed30514afcf314b40c69b9cac088602a83da':
bionic_auxv.h: fix #define conflict
2013-01-22 13:43:46 -08:00