Narayan Kamath
822b1a024d
Merge "Add a config for dual mode zygote."
2014-04-11 08:22:38 +00:00
Paul Lawrence
f24aab7d74
Fix forceencrypt
...
When changing vdc cryptfs enablecrypto inplace default in
https://googleplex-android-review.git.corp.google.com/#/c/445001/
forgot to change init.rc
Change-Id: I2a937d3c302ab8eab4829a36101145d6fe726ab1
2014-04-10 13:31:46 -07:00
Narayan Kamath
ea659643ee
HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.
...
HAVE_POSIX_CLOCKS imples clock_gettime,settime and
CLOCK_REALTIME / CLOCK_MONOTONIC.
CLOCK_BOOTTIME appears only on newer versions of glibc
and might only be supported on newer kernels.
Change-Id: I66e724a3593538c3b80de2c5f81a964d3fa96eaf
2014-04-10 20:19:20 +01:00
Mark Salyzyn
cf805481bf
am 202a990f
: am 97ea695a
: am 032f5f23
: Merge "logd: Statistics: Add up to 10 chattiest clients"
...
* commit '202a990f20828d6a11d6c616078746f7210d24a9':
logd: Statistics: Add up to 10 chattiest clients
2014-04-10 17:39:44 +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
fb59398dc6
am 63a14ed7
: am ae3ba0b3
: am 472e04f2
: Merge "logd: liblog: logcat: enable prune features for user"
...
* commit '63a14ed7fc728f84f9496fc99bc1df01b5bc8b16':
logd: liblog: logcat: enable prune features for user
2014-04-09 23:41:29 +00: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
11673a03e0
am 8b4ea5a4
: am 39a5b812
: am 2baf2886
: Merge "Enable world-readable selinuxfs policy binary."
...
* commit '8b4ea5a49dda2767af87604713053e1bc418e96f':
Enable world-readable selinuxfs policy binary.
2014-04-09 16:41:17 +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
Paul Lawrence
8d176e6bdd
Merge "Add force_encrypt flag to fstab to force encryption on appropriate devices"
2014-04-09 15:43:57 +00:00
Greg Hackmann
2be33e08e9
am 7b6a8cba
: am 679e2c25
: am 9101878d
: Merge "logd: fix LogStatistics::format freeing wrong pointer"
...
* commit '7b6a8cbae956de544f01c43ec0814130aea1f846':
logd: fix LogStatistics::format freeing wrong pointer
2014-04-07 23:37:57 +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
241d5aa3d2
am 8f2a205f
: am 1a09a804
: am 47d374ec
: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."
...
* commit '8f2a205f34bfad9eddbd62a073d1ca492276d538':
Move date off the non-portable bionic32 'strtotimeval'.
2014-04-07 22:42:28 +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
4854a36e2a
am 1f87d3ab
: am 83fd6375
: am 31631861
: Merge "Add guards to prevent typedefs when C++11 is available."
...
* commit '1f87d3ab8c384d03d1496c63f7faad15bd5eeba9':
Add guards to prevent typedefs when C++11 is available.
2014-04-07 22:12:07 +00: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
3b9e3a10f9
am 7af3b47d
: am 21ad8b4b
: am 6b91fefd
: Merge "logd: Turn off default prune by worst UID"
...
* commit '7af3b47d24ea7ad9bfcbf98d6d250d34c6725d52':
logd: Turn off default prune by worst UID
2014-04-07 19:58:37 +00: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
Mark Salyzyn
0bb5288c0e
logd: Turn off default prune by worst UID
...
- Algorithm places too much weight on stack dumps
Change-Id: Ibb31a59892870397b780965ec791f47a4ce87eaf
2014-04-07 12:17:19 -07:00
Mark Salyzyn
78886a6dfc
am ce2a0ecf
: am ffd72150
: am 3e73a99f
: Merge "logd: auditd: add logd.auditd.dmesg property"
...
* commit 'ce2a0ecf29fadbd63ea2397b2d87a02b27a2d20f':
logd: auditd: add logd.auditd.dmesg property
2014-04-07 18:07:36 +00:00
Mark Salyzyn
7ddea01bbf
am 219ed707
: am 4336d13c
: am 85010465
: Merge "logd: selinux auditd initial commit"
...
* commit '219ed7079abb6ffb9545ca8457a644ca3d0af872':
logd: selinux auditd initial commit
2014-04-07 18:07:35 +00:00
Mark Salyzyn
a12e8ad4b6
am c3679233
: am 236d6a81
: am 44853351
: Merge "logd: Add pidToUid helper"
...
* commit 'c36792338849e0e93599b723afa4621c82068edd':
logd: Add pidToUid helper
2014-04-07 18:07:34 +00:00
Mark Salyzyn
baf80026cf
am b1e678d9
: am cfb2f579
: am ebdf9778
: Merge "logd: Add pidToName helper"
...
* commit 'b1e678d98f601a1dc6d4b0042ce6b5dc0de0186e':
logd: Add pidToName helper
2014-04-07 18:07:34 +00:00
Mark Salyzyn
ce2a0ecf29
am ffd72150
: am 3e73a99f
: Merge "logd: auditd: add logd.auditd.dmesg property"
...
* commit 'ffd721502e00e787ea0f89d6d537de52d4fc4542':
logd: auditd: add logd.auditd.dmesg property
2014-04-07 18:04:17 +00:00
Mark Salyzyn
219ed7079a
am 4336d13c
: am 85010465
: Merge "logd: selinux auditd initial commit"
...
* commit '4336d13cb12a8e779d4c56c45dc6d7a47c0b7898':
logd: selinux auditd initial commit
2014-04-07 18:04:17 +00:00
Mark Salyzyn
c367923388
am 236d6a81
: am 44853351
: Merge "logd: Add pidToUid helper"
...
* commit '236d6a814396e2678f17487c761f30f7481e5f3b':
logd: Add pidToUid helper
2014-04-07 18:04:16 +00:00
Mark Salyzyn
b1e678d98f
am cfb2f579
: am ebdf9778
: Merge "logd: Add pidToName helper"
...
* commit 'cfb2f57916818701097e0d08b2b6193ba43d2274':
logd: Add pidToName helper
2014-04-07 18:04:15 +00:00
Mark Salyzyn
ffd721502e
am 3e73a99f
: Merge "logd: auditd: add logd.auditd.dmesg property"
...
* commit '3e73a99ff28a0fc0765ad3fc899cfb15f5c230f8':
logd: auditd: add logd.auditd.dmesg property
2014-04-07 17:58:36 +00:00
Mark Salyzyn
4336d13cb1
am 85010465
: Merge "logd: selinux auditd initial commit"
...
* commit '8501046553ac99a278f10377c2ccf9ee6d82eeb1':
logd: selinux auditd initial commit
2014-04-07 17:58:36 +00:00
Mark Salyzyn
236d6a8143
am 44853351
: Merge "logd: Add pidToUid helper"
...
* commit '448533515002d8836f00d5b7127a814df370c125':
logd: Add pidToUid helper
2014-04-07 17:58:35 +00:00