Narayan Kamath
c5aff68693
am cda31324
: am 4706320e
: Merge "Include 64bit valgrind in the android_filesystem_config."
...
* commit 'cda31324afdc3e9d1bc5d2e9ee45985cf1fb8819':
Include 64bit valgrind in the android_filesystem_config.
2014-04-14 16:01:31 +00:00
Narayan Kamath
cda31324af
am 4706320e
: Merge "Include 64bit valgrind in the android_filesystem_config."
...
* commit '4706320eb30812b301675b15a35036190a1c87b6':
Include 64bit valgrind in the android_filesystem_config.
2014-04-14 15:58:22 +00:00
Narayan Kamath
4706320eb3
Merge "Include 64bit valgrind in the android_filesystem_config."
2014-04-14 15:56:37 +00:00
Colin Cross
8d57b79c26
am bf66e448
: am a1551e9b
: Merge "Fix buffer overflow in syren utility"
...
* commit 'bf66e4486d1ded51da45d69548e138ab7a75967d':
Fix buffer overflow in syren utility
2014-04-13 18:09:35 +00:00
Colin Cross
bf66e4486d
am a1551e9b
: Merge "Fix buffer overflow in syren utility"
...
* commit 'a1551e9b4c586d654224810100f15e8a46c64a7e':
Fix buffer overflow in syren utility
2014-04-13 18:06:52 +00:00
Colin Cross
a1551e9b4c
Merge "Fix buffer overflow in syren utility"
2014-04-13 18:04:23 +00:00
nks
3967f81b56
Fix buffer overflow in syren utility
...
Patch for https://code.google.com/p/android/issues/detail?id=68268
A length check for the argv[2] was added in order to prevent buffer
overflow. Also replace strcpy with strlcpy.
Signed-off-by: nks <nks@sixserv.org>
Change-Id: If65b83e9b658315c672e684f64e3ae00e69fac31
2014-04-13 10:45:30 -07:00
Narayan Kamath
6b7ab90ca9
Include 64bit valgrind in the android_filesystem_config.
...
Required so that we set the exectuable bit correctly.
Change-Id: If59bd0ff47d2b4b2b8f92a1c007b4ba414ea1876
2014-04-12 09:11:16 +01:00
Sasha Levitskiy
43cb7ae6c3
am 4f362e43
: am 835526fd
: Merge "Cleanup: warning fixit."
...
* commit '4f362e438c6ee5688c4f2f444203ed7acffa566b':
Cleanup: warning fixit.
2014-04-12 00:00:02 +00:00
Sasha Levitskiy
4f362e438c
am 835526fd
: Merge "Cleanup: warning fixit."
...
* commit '835526fdc035cad6d712a7098d0eae37b3995d2c':
Cleanup: warning fixit.
2014-04-11 23:57:21 +00:00
Sasha Levitskiy
835526fdc0
Merge "Cleanup: warning fixit."
2014-04-11 23:54:05 +00:00
Ben Cheng
7acecec433
am 3c29e66e
: am 2f365509
: Merge "Fix signed vs unsigned comparison."
...
* commit '3c29e66eaa683fcd1412f618f9da1e7c2e2b52aa':
Fix signed vs unsigned comparison.
2014-04-11 23:34:59 +00:00
Ben Cheng
3c29e66eaa
am 2f365509
: Merge "Fix signed vs unsigned comparison."
...
* commit '2f365509eb8a3696feb8063ba8e17ebd12beb7ff':
Fix signed vs unsigned comparison.
2014-04-11 23:31:24 +00:00
Ben Cheng
2f365509eb
Merge "Fix signed vs unsigned comparison."
2014-04-11 23:28:08 +00:00
Ben Cheng
1bafa52172
Fix signed vs unsigned comparison.
...
Change-Id: I4011607858f3a82acc04509c9f795f960496ed69
2014-04-11 16:27:30 -07:00
Sasha Levitskiy
cdc1cfb3e5
Cleanup: warning fixit.
...
bootable/recovery has a dependent commit: I9adb470b04e4301989d128c9c3097b21b4dea431
Change-Id: Icf23e659265d71d5226d527c2b40cfbc132320ee
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-11 16:15:46 -07:00
Mark Salyzyn
3559d98c26
am eef9f1da
: am ba419940
: Merge "logcat: Better help message for white and black list"
...
* commit 'eef9f1da0b93e542aa25c5db6e5041609aaff77d':
logcat: Better help message for white and black list
2014-04-11 21:41:06 +00:00
Mark Salyzyn
eef9f1da0b
am ba419940
: Merge "logcat: Better help message for white and black list"
...
* commit 'ba419940f75d93ac4aacef695da0570b1591f140':
logcat: Better help message for white and black list
2014-04-11 21:37:40 +00:00
Mark Salyzyn
ba419940f7
Merge "logcat: Better help message for white and black list"
2014-04-11 21:34:09 +00:00
Mark Salyzyn
bbbe14f758
logcat: Better help message for white and black list
...
Change-Id: Ia739260b4e0fcf8062ad9166fd65b1d6e7bb446c
2014-04-11 13:49:43 -07:00
Narayan Kamath
d85efaa068
am a73f7e92
: am 822b1a02
: Merge "Add a config for dual mode zygote."
...
* commit 'a73f7e924abb8e7b1aa3f0d64d0177ce7d1c58e6':
Add a config for dual mode zygote.
2014-04-11 09:57:24 +00:00
Narayan Kamath
a73f7e924a
am 822b1a02
: Merge "Add a config for dual mode zygote."
...
* commit '822b1a024d058641be9aefa14da794f09755ce35':
Add a config for dual mode zygote.
2014-04-11 08:42:02 +00:00
Narayan Kamath
822b1a024d
Merge "Add a config for dual mode zygote."
2014-04-11 08:22:38 +00:00
Mark Salyzyn
202a990f20
am 97ea695a
: am 032f5f23
: Merge "logd: Statistics: Add up to 10 chattiest clients"
...
* commit '97ea695af71ea6301b423700e363b13289279366':
logd: Statistics: Add up to 10 chattiest clients
2014-04-10 17:36:48 +00:00
Mark Salyzyn
97ea695af7
am 032f5f23
: Merge "logd: Statistics: Add up to 10 chattiest clients"
...
* commit '032f5f23005d8c5d4558618c5c46d3a92752b408':
logd: Statistics: Add up to 10 chattiest clients
2014-04-10 17:34:15 +00:00
Mark Salyzyn
032f5f2300
Merge "logd: Statistics: Add up to 10 chattiest clients"
2014-04-10 17:30:44 +00:00
Mark Salyzyn
8e72c5384b
logd: Statistics: Add up to 10 chattiest clients
...
- embellish pid name
- >1% of the logs
- fix PID gone detection (EPERM)
- some ? : cleanup
Change-Id: Iba3b306e1fee43e53931165819a398693910514b
2014-04-10 08:59:53 -07:00
Narayan Kamath
468b37c106
Add a config for dual mode zygote.
...
Note that init.zygote64.rc, which supports a "pure"
64 bit zygote is around only for testing.
The life cycles of both zygotes are controlled by init,
and the assumption here is that they will be available
always. We start the system_server in 32 bit mode.
Note that the distinction between "primary" and "secondary"
simply defines the order in which ABI support is queried,
there's no real requirement that the primary zygote supports
the primary ABI of the device.
bug: 13647418
Change-Id: Id0be001ea6f934c3c2022d89a63aae9fae66cc38
2014-04-10 10:45:37 +01:00
Mark Salyzyn
63a14ed7fc
am ae3ba0b3
: am 472e04f2
: Merge "logd: liblog: logcat: enable prune features for user"
...
* commit 'ae3ba0b339e7a768fe58f179fdab55f273419e1e':
logd: liblog: logcat: enable prune features for user
2014-04-09 23:37:45 +00:00
Mark Salyzyn
ae3ba0b339
am 472e04f2
: Merge "logd: liblog: logcat: enable prune features for user"
...
* commit '472e04f2b4b1870f8be789a3f16c2abb664b731a':
logd: liblog: logcat: enable prune features for user
2014-04-09 23:35:45 +00:00
Mark Salyzyn
472e04f2b4
Merge "logd: liblog: logcat: enable prune features for user"
2014-04-09 23:33:28 +00:00
dcashman
8b4ea5a49d
am 39a5b812
: am 2baf2886
: Merge "Enable world-readable selinuxfs policy binary."
...
* commit '39a5b812904ec13390d6261bafccf823729ae21d':
Enable world-readable selinuxfs policy binary.
2014-04-09 16:37:05 +00:00
dcashman
39a5b81290
am 2baf2886
: Merge "Enable world-readable selinuxfs policy binary."
...
* commit '2baf2886826db1a137fa765a991f30a3937e7c4d':
Enable world-readable selinuxfs policy binary.
2014-04-09 16:33:51 +00:00
dcashman
2baf288682
Merge "Enable world-readable selinuxfs policy binary."
2014-04-09 16:30:23 +00:00
Greg Hackmann
7b6a8cbae9
am 679e2c25
: am 9101878d
: Merge "logd: fix LogStatistics::format freeing wrong pointer"
...
* commit '679e2c252274a7072c65471d6799a962261e1883':
logd: fix LogStatistics::format freeing wrong pointer
2014-04-07 23:32:00 +00:00
Greg Hackmann
679e2c2522
am 9101878d
: Merge "logd: fix LogStatistics::format freeing wrong pointer"
...
* commit '9101878dd06a74cedeadca3fec3b3db68cba8bf0':
logd: fix LogStatistics::format freeing wrong pointer
2014-04-07 23:25:55 +00:00
Greg Hackmann
9101878dd0
Merge "logd: fix LogStatistics::format freeing wrong pointer"
2014-04-07 23:18:58 +00:00
Elliott Hughes
8f2a205f34
am 1a09a804
: am 47d374ec
: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."
...
* commit '1a09a804ba0c96182e8193cb5e96090893ad9a7c':
Move date off the non-portable bionic32 'strtotimeval'.
2014-04-07 22:36:43 +00:00
Elliott Hughes
1a09a804ba
am 47d374ec
: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."
...
* commit '47d374ec27af7bc431a86a592822fbb15ff6ba3c':
Move date off the non-portable bionic32 'strtotimeval'.
2014-04-07 22:31:18 +00:00
Elliott Hughes
47d374ec27
Merge "Move date off the non-portable bionic32 'strtotimeval'."
2014-04-07 22:25:18 +00:00
Elliott Hughes
e25a6413d3
Move date off the non-portable bionic32 'strtotimeval'.
...
Change-Id: Ib706d3a536c409810cfbc47270448c6375314506
2014-04-07 15:24:47 -07:00
Greg Hackmann
239605ef64
logd: fix LogStatistics::format freeing wrong pointer
...
Fixes a leak and use-after-free if a client passes in an
already-allocated target buffer (currently none do)
Change-Id: Ie20c30bd5ba31e1b6db73885bd9d2ebd7e40dc27
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-04-07 15:17:30 -07:00
Tim Murray
1f87d3ab8c
am 83fd6375
: am 31631861
: Merge "Add guards to prevent typedefs when C++11 is available."
...
* commit '83fd6375f6d9016afe9bb03453d39b8c41cda548':
Add guards to prevent typedefs when C++11 is available.
2014-04-07 22:06:38 +00:00
Tim Murray
83fd6375f6
am 31631861
: Merge "Add guards to prevent typedefs when C++11 is available."
...
* commit '31631861647aadc28d6311a211419be79c34c7b0':
Add guards to prevent typedefs when C++11 is available.
2014-04-07 22:00:12 +00:00
Tim Murray
3163186164
Merge "Add guards to prevent typedefs when C++11 is available."
2014-04-07 21:54:26 +00:00
Tim Murray
ae83f84548
Add guards to prevent typedefs when C++11 is available.
...
char32_t and char16_t are both defined in C++11.
Change-Id: I44fe8f4f05f230c18a1b77fa21b6a40c8f8ecc2d
2014-04-07 14:11:21 -07:00
dcashman
5822a4af84
Enable world-readable selinuxfs policy binary.
...
Change-Id: I1eefb457cea1164a8aa9eeb7683b3d99ee56ca99
2014-04-07 14:05:43 -07:00
Mark Salyzyn
7af3b47d24
am 21ad8b4b
: am 6b91fefd
: Merge "logd: Turn off default prune by worst UID"
...
* commit '21ad8b4b2c2eb4efa9b1ad0f86b6bed989c64438':
logd: Turn off default prune by worst UID
2014-04-07 19:51:49 +00:00
Mark Salyzyn
21ad8b4b2c
am 6b91fefd
: Merge "logd: Turn off default prune by worst UID"
...
* commit '6b91fefdb22b33d7cdebe10fab4db834f5f8784d':
logd: Turn off default prune by worst UID
2014-04-07 19:48:26 +00:00
Mark Salyzyn
6b91fefdb2
Merge "logd: Turn off default prune by worst UID"
2014-04-07 19:43:38 +00:00