The Android Automerger
2a523d1a06
merge in jb-mr2-release history after reset to master
2013-01-29 07:10:09 -08:00
Elliott Hughes
62228694a0
am 2218b89c
: am d383ac15
: am a0151cbf
: Merge "Unit tests for formatting code, fix %%."
...
# Via Android Git Automerger (2) and others
* commit '2218b89ca7017e3f1cdb0641528787cd9985501a':
Unit tests for formatting code, fix %%.
2013-01-28 14:14:44 -08:00
Elliott Hughes
2218b89ca7
am d383ac15
: am a0151cbf
: Merge "Unit tests for formatting code, fix %%."
...
# Via Android Git Automerger (1) and others
* commit 'd383ac1570b553d68ed399c74b73bad1498d78f6':
Unit tests for formatting code, fix %%.
2013-01-28 14:11:54 -08:00
Elliott Hughes
d383ac1570
am a0151cbf
: Merge "Unit tests for formatting code, fix %%."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a0151cbfbaa37965dbcd188a55a78d3ad4802b9b':
Unit tests for formatting code, fix %%.
2013-01-28 14:10:08 -08:00
Elliott Hughes
a0151cbfba
Merge "Unit tests for formatting code, fix %%."
2013-01-28 22:04:45 +00:00
Elliott Hughes
41b3179c9e
Unit tests for formatting code, fix %%.
...
Also fix <signal.h> and <stdio.h> so they don't cause compiler warnings.
Change-Id: Ib1a746bf01de22d47dbd964de0e6af80a7c96303
2013-01-28 10:36:31 -08:00
The Android Automerger
8482fbb691
merge in jb-mr2-release history after reset to master
2013-01-28 07:10:05 -08:00
Elliott Hughes
609ca692a9
am d265d367
: am f07db754
: am 0a91b11d
: Merge "More debug malloc fixes."
...
# Via Android Git Automerger (2) and others
* commit 'd265d3674937651d23a0252e6aad0ee09b02492a':
More debug malloc fixes.
2013-01-25 18:11:55 -08:00
Elliott Hughes
d265d36749
am f07db754
: am 0a91b11d
: Merge "More debug malloc fixes."
...
# Via Android Git Automerger (1) and others
* commit 'f07db75443cce4ab96c93bdaa0793d7b8e87547e':
More debug malloc fixes.
2013-01-25 18:09:45 -08:00
Elliott Hughes
f07db75443
am 0a91b11d
: Merge "More debug malloc fixes."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '0a91b11d286446fe7849a6f537b4a21a52f63399':
More debug malloc fixes.
2013-01-25 18:07:23 -08:00
Elliott Hughes
0a91b11d28
Merge "More debug malloc fixes."
2013-01-26 01:55:43 +00:00
Iliyan Malchev
ac10757e2a
Merge "bionic: update processed msm_vidc_enc.h"
2013-01-26 01:41:55 +00:00
Elliott Hughes
239e7a0756
More debug malloc fixes.
...
Include the leaky executable's name in the log output. Fix the "sh" test.
Use uintptr_t instead of intptr_t.
Also fix debug formatting of NULL with %s.
Bug: 7291287
Change-Id: I015bf341cd48d43a247173612e6ccb1bf1243d53
2013-01-25 17:13:45 -08:00
Elliott Hughes
98ce9888b1
am 88af7232
: am 7ae99845
: am 6a94cb74
: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Android Git Automerger (2) and others
* commit '88af723267e86c7b2a685f97c6e442d3766ad9a9':
arm syscall : for eabi call_default don't use stack
2013-01-25 17:11:52 -08:00
Nick Kralevich
85e76a3652
am 2ebcd19c
: am 27818d2a
: am b871e5d6
: Merge "system_properties: do more checking of file"
...
# Via Android Git Automerger (2) and others
* commit '2ebcd19cbc42c5edce189df630a48feb9ffec16d':
system_properties: do more checking of file
2013-01-25 17:11:51 -08:00
Elliott Hughes
88af723267
am 7ae99845
: am 6a94cb74
: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Android Git Automerger (1) and others
* commit '7ae998456c2564aff4ecbe6a6df214821f6e26cc':
arm syscall : for eabi call_default don't use stack
2013-01-25 14:10:02 -08:00
Nick Kralevich
2ebcd19cbc
am 27818d2a
: am b871e5d6
: Merge "system_properties: do more checking of file"
...
# Via Android Git Automerger (1) and others
* commit '27818d2a16e4972acba15368f55a59cc0ed990f0':
system_properties: do more checking of file
2013-01-25 14:10:01 -08:00
Elliott Hughes
7ae998456c
am 6a94cb74
: Merge "arm syscall : for eabi call_default don\'t use stack"
...
# By Matthieu Castet
# Via Gerrit Code Review (1) and Matthieu Castet (1)
* commit '6a94cb748bf63278c3271b0ab610061b0dc6f04a':
arm syscall : for eabi call_default don't use stack
2013-01-25 14:08:26 -08:00
Nick Kralevich
27818d2a16
am b871e5d6
: Merge "system_properties: do more checking of file"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'b871e5d6b3b4a214c7f19bdfca7663f1fe49fda8':
system_properties: do more checking of file
2013-01-25 14:08:26 -08:00
Elliott Hughes
6a94cb748b
Merge "arm syscall : for eabi call_default don't use stack"
2013-01-25 21:57:58 +00:00
Nick Kralevich
b871e5d6b3
Merge "system_properties: do more checking of file"
2013-01-25 21:52:00 +00:00
Nick Kralevich
c16961b8c3
system_properties: do more checking of file
...
Check that the permissions on the properties file
are exactly as we expect them to be.
Make sure we close the fd if fstat fails.
Refactor the code slightly.
Change-Id: I5503fd58c3b8093ce7e6d05920748ed70eaf8e2c
2013-01-25 13:07:31 -08:00
Iliyan Malchev
3eaa03df03
bionic: update processed msm_vidc_enc.h
...
Change-Id: If9aeec6f43b8b2951d1372042c884cd0e01f0a5a
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-01-25 11:26:53 -08:00
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