summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 2f365509: Merge "Fix signed vs unsigned comparison."Ben Cheng2014-04-111-1/+1
|\ | | | | | | | | * commit '2f365509eb8a3696feb8063ba8e17ebd12beb7ff': Fix signed vs unsigned comparison.
| * Merge "Fix signed vs unsigned comparison."Ben Cheng2014-04-111-1/+1
| |\
| | * Fix signed vs unsigned comparison.Ben Cheng2014-04-111-1/+1
| |/ | | | | | | Change-Id: I4011607858f3a82acc04509c9f795f960496ed69
* | am ba419940: Merge "logcat: Better help message for white and black list"Mark Salyzyn2014-04-111-6/+10
|\ \ | |/ | | | | | | * commit 'ba419940f75d93ac4aacef695da0570b1591f140': logcat: Better help message for white and black list
| * Merge "logcat: Better help message for white and black list"Mark Salyzyn2014-04-111-6/+10
| |\
| | * logcat: Better help message for white and black listMark Salyzyn2014-04-111-6/+10
| |/ | | | | | | Change-Id: Ia739260b4e0fcf8062ad9166fd65b1d6e7bb446c
* | am 822b1a02: Merge "Add a config for dual mode zygote."Narayan Kamath2014-04-111-0/+12
|\ \ | |/ | | | | | | * commit '822b1a024d058641be9aefa14da794f09755ce35': Add a config for dual mode zygote.
| * Merge "Add a config for dual mode zygote."Narayan Kamath2014-04-111-0/+12
| |\
| | * Add a config for dual mode zygote.Narayan Kamath2014-04-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 032f5f23: Merge "logd: Statistics: Add up to 10 chattiest clients"Mark Salyzyn2014-04-101-7/+108
|\ \ \ | |/ / | | | | | | | | | * commit '032f5f23005d8c5d4558618c5c46d3a92752b408': logd: Statistics: Add up to 10 chattiest clients
| * | Merge "logd: Statistics: Add up to 10 chattiest clients"Mark Salyzyn2014-04-101-7/+108
| |\ \
| | * | logd: Statistics: Add up to 10 chattiest clientsMark Salyzyn2014-04-101-7/+108
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | - embellish pid name - >1% of the logs - fix PID gone detection (EPERM) - some ? : cleanup Change-Id: Iba3b306e1fee43e53931165819a398693910514b
* | | am 472e04f2: Merge "logd: liblog: logcat: enable prune features for user"Mark Salyzyn2014-04-0914-149/+11
|\ \ \ | |/ / | | | | | | | | | * commit '472e04f2b4b1870f8be789a3f16c2abb664b731a': logd: liblog: logcat: enable prune features for user
| * | Merge "logd: liblog: logcat: enable prune features for user"Mark Salyzyn2014-04-0914-149/+11
| |\ \
| | * | logd: liblog: logcat: enable prune features for userMark Salyzyn2014-04-0214-149/+11
| | | | | | | | | | | | | | | | | | | | | | | | - Enable whitelist, blacklist and logsize tuneables for user Change-Id: Id0c283844c71c5263a8cfbebf2e550f7ac415858
* | | | am 2baf2886: Merge "Enable world-readable selinuxfs policy binary."dcashman2014-04-091-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '2baf2886826db1a137fa765a991f30a3937e7c4d': Enable world-readable selinuxfs policy binary.
| * | | Merge "Enable world-readable selinuxfs policy binary."dcashman2014-04-091-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Enable world-readable selinuxfs policy binary.dcashman2014-04-071-0/+3
| | | | | | | | | | | | | | | | Change-Id: I1eefb457cea1164a8aa9eeb7683b3d99ee56ca99
* | | | am 9101878d: Merge "logd: fix LogStatistics::format freeing wrong pointer"Greg Hackmann2014-04-071-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9101878dd06a74cedeadca3fec3b3db68cba8bf0': logd: fix LogStatistics::format freeing wrong pointer
| * | | Merge "logd: fix LogStatistics::format freeing wrong pointer"Greg Hackmann2014-04-071-1/+1
| |\ \ \
| | * | | logd: fix LogStatistics::format freeing wrong pointerGreg Hackmann2014-04-071-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | am 47d374ec: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."Elliott Hughes2014-04-071-4/+34
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '47d374ec27af7bc431a86a592822fbb15ff6ba3c': Move date off the non-portable bionic32 'strtotimeval'.
| * | | Merge "Move date off the non-portable bionic32 'strtotimeval'."Elliott Hughes2014-04-071-4/+34
| |\ \ \
| | * | | Move date off the non-portable bionic32 'strtotimeval'.Elliott Hughes2014-04-071-4/+34
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib706d3a536c409810cfbc47270448c6375314506
* | | | | am 31631861: Merge "Add guards to prevent typedefs when C++11 is available."Tim Murray2014-04-071-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '31631861647aadc28d6311a211419be79c34c7b0': Add guards to prevent typedefs when C++11 is available.
| * | | | Merge "Add guards to prevent typedefs when C++11 is available."Tim Murray2014-04-071-0/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add guards to prevent typedefs when C++11 is available.Tim Murray2014-04-071-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | char32_t and char16_t are both defined in C++11. Change-Id: I44fe8f4f05f230c18a1b77fa21b6a40c8f8ecc2d
* | | | am 6b91fefd: Merge "logd: Turn off default prune by worst UID"Mark Salyzyn2014-04-071-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6b91fefdb22b33d7cdebe10fab4db834f5f8784d': logd: Turn off default prune by worst UID
| * | | Merge "logd: Turn off default prune by worst UID"Mark Salyzyn2014-04-071-1/+1
| |\ \ \
| | * | | logd: Turn off default prune by worst UIDMark Salyzyn2014-04-071-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | - Algorithm places too much weight on stack dumps Change-Id: Ibb31a59892870397b780965ec791f47a4ce87eaf
* | | | am 3e73a99f: Merge "logd: auditd: add logd.auditd.dmesg property"Mark Salyzyn2014-04-073-7/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3e73a99ff28a0fc0765ad3fc899cfb15f5c230f8': logd: auditd: add logd.auditd.dmesg property
| * | | Merge "logd: auditd: add logd.auditd.dmesg property"Mark Salyzyn2014-04-073-7/+30
| |\ \ \
| | * | | logd: auditd: add logd.auditd.dmesg propertyMark Salyzyn2014-04-073-7/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: If4a579c2221eec99cf3f6acf59ead8c2d5230517
* | | | | am 85010465: Merge "logd: selinux auditd initial commit"Mark Salyzyn2014-04-077-2/+639
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8501046553ac99a278f10377c2ccf9ee6d82eeb1': logd: selinux auditd initial commit
| * | | | Merge "logd: selinux auditd initial commit"Mark Salyzyn2014-04-077-2/+639
| |\ \ \ \ | | |/ / /
| | * | | logd: selinux auditd initial commitWilliam Roberts2014-04-077-2/+639
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial commit for an audit daemon that writes kernel audit messages to the Android logger. The daemon searches dmesg for all lines that contain "audit" and writes them. Then receiving the messages from the netlink socket. It also formats the messages so they are compatable with ausearch (type=<t> <m> format) Modified: Mark Salyzyn <salyzyn@google.com> - do not start auditd - merge into logd, stripping unnecessary file logging. - Convert headers and code to support C++ - Fix bugs in libaudit - squash timestamp (replace with 0.0) due to duplication - squash pid due to duplication - squash comm due to duplication Change-Id: I421bcf33e7e670d596628b1b5c7c25536ce2d3fe
* | | | | am 44853351: Merge "logd: Add pidToUid helper"Mark Salyzyn2014-04-073-0/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '448533515002d8836f00d5b7127a814df370c125': logd: Add pidToUid helper
| * | | | Merge "logd: Add pidToUid helper"Mark Salyzyn2014-04-073-0/+19
| |\ \ \ \ | | |/ / /
| | * | | logd: Add pidToUid helperMark Salyzyn2014-04-073-0/+19
| | | | | | | | | | | | | | | | | | | | Change-Id: I23ebae1957c027bff6cbc2573a227bf0c44c08a2
* | | | | am ebdf9778: Merge "logd: Add pidToName helper"Mark Salyzyn2014-04-073-6/+69
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ebdf9778a08c8ff23d4e4aab3041c7642c74aa89': logd: Add pidToName helper
| * | | | Merge "logd: Add pidToName helper"Mark Salyzyn2014-04-073-6/+69
| |\ \ \ \ | | |/ / /
| | * | | logd: Add pidToName helperMark Salyzyn2014-04-073-6/+69
| |/ / / | | | | | | | | | | | | Change-Id: Idd8e804ab65feb8dc432150ae701464de1ad5302
* | | | am d1d2c15d: Merge "logd: transitory reader thread create should be detached"Mark Salyzyn2014-04-041-5/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd1d2c15de8ea09989e8072d197c22020860f1461': logd: transitory reader thread create should be detached
| * | | Merge "logd: transitory reader thread create should be detached"Mark Salyzyn2014-04-041-5/+16
| |\ \ \
| | * | | logd: transitory reader thread create should be detachedMark Salyzyn2014-04-041-5/+16
| |/ / / | | | | | | | | | | | | | | | | Bug: 13692914 Change-Id: Ia7306e6e844ae9f17c6f594bf6b25f3148652570
* | | | am a97798af: Merge "Create an UnwindMapLocal object."Christopher Ferris2014-04-0414-63/+380
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a97798afc9105668a80b775516a7cc4db341a62e': Create an UnwindMapLocal object.
| * | | Merge "Create an UnwindMapLocal object."Christopher Ferris2014-04-0414-63/+380
| |\ \ \ | | |/ / | |/| |
| | * | Create an UnwindMapLocal object.Christopher Ferris2014-04-0314-63/+380
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way libunwind handles local unwinds is different from remote unwinds, so create a new map object to handle the differences. Add new test to verify the map data is being generated correctly. Add new tests to check for leaks. Refactor the BACK_LOGW code into a single header file. Change-Id: I01f3cbfc4b927646174ea1b614fa25d23b9b3427
* | | am 5f130216: Merge "Handle errno properly to avoid corrupt str_parms"Elliott Hughes2014-04-032-13/+54
|\ \ \ | |/ / | | | | | | | | | * commit '5f130216762278331b5d97eaf1fb549680143c85': Handle errno properly to avoid corrupt str_parms
| * | Merge "Handle errno properly to avoid corrupt str_parms"Elliott Hughes2014-04-032-13/+54
| |\ \ | | |/ | |/|