summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 43cb7ae6: am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."Sasha Levitskiy2014-04-129-28/+18
|\ | | | | | | | | * commit '43cb7ae6c31ced8cd518eab59dfea31ab1ade812': Cleanup: warning fixit.
| * am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."Sasha Levitskiy2014-04-129-28/+18
| |\ | | | | | | | | | | | | * commit '4f362e438c6ee5688c4f2f444203ed7acffa566b': Cleanup: warning fixit.
| | * am 835526fd: Merge "Cleanup: warning fixit."Sasha Levitskiy2014-04-119-28/+18
| | |\ | | | | | | | | | | | | | | | | * commit '835526fdc035cad6d712a7098d0eae37b3995d2c': Cleanup: warning fixit.
| | | * Merge "Cleanup: warning fixit."Sasha Levitskiy2014-04-119-28/+18
| | | |\
| | | | * Cleanup: warning fixit.Sasha Levitskiy2014-04-119-28/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bootable/recovery has a dependent commit: I9adb470b04e4301989d128c9c3097b21b4dea431 Change-Id: Icf23e659265d71d5226d527c2b40cfbc132320ee Signed-off-by: Sasha Levitskiy <sanek@google.com>
* | | | | am 7acecec4: am 3c29e66e: am 2f365509: Merge "Fix signed vs unsigned ↵Ben Cheng2014-04-111-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | comparison." * commit '7acecec433b396405279c3fa35359636dbcc7d47': Fix signed vs unsigned comparison.
| * | | | am 3c29e66e: am 2f365509: Merge "Fix signed vs unsigned comparison."Ben Cheng2014-04-111-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '3c29e66eaa683fcd1412f618f9da1e7c2e2b52aa': Fix signed vs unsigned comparison.
| | * | | 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
* | | | | Merge "Avoid logging functions from signal handler."Christopher Ferris2014-04-112-8/+14
|\ \ \ \ \
| * | | | | Avoid logging functions from signal handler.Christopher Ferris2014-04-112-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic61f7054ced223631f95efb519fa1825fb3e1010
* | | | | | am 3559d98c: am eef9f1da: am ba419940: Merge "logcat: Better help message ↵Mark Salyzyn2014-04-111-6/+10
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | for white and black list" * commit '3559d98c267a6302618c9708e1fae298de2fcc1b': logcat: Better help message for white and black list
| * | | | am eef9f1da: am ba419940: Merge "logcat: Better help message for white and ↵Mark Salyzyn2014-04-111-6/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | black list" * commit 'eef9f1da0b93e542aa25c5db6e5041609aaff77d': logcat: Better help message for white and black list
| | * | | 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
* | | | Merge "Fix forceencrypt"Paul Lawrence2014-04-111-1/+1
|\ \ \ \
| * | | | Fix forceencryptPaul Lawrence2014-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am d85efaa0: am a73f7e92: am 822b1a02: Merge "Add a config for dual mode ↵Narayan Kamath2014-04-111-0/+12
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | zygote." * commit 'd85efaa068708b19db3cc647ba62c0a2feb7da23': Add a config for dual mode zygote.
| * | | | am a73f7e92: am 822b1a02: Merge "Add a config for dual mode zygote."Narayan Kamath2014-04-111-0/+12
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'a73f7e924abb8e7b1aa3f0d64d0177ce7d1c58e6': Add a config for dual mode zygote.
| | * | | 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 202a990f: am 97ea695a: am 032f5f23: Merge "logd: Statistics: Add up to 10 ↵Mark Salyzyn2014-04-101-7/+108
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | chattiest clients" * commit '202a990f20828d6a11d6c616078746f7210d24a9': logd: Statistics: Add up to 10 chattiest clients
| * | | | am 97ea695a: am 032f5f23: Merge "logd: Statistics: Add up to 10 chattiest ↵Mark Salyzyn2014-04-101-7/+108
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | clients" * commit '97ea695af71ea6301b423700e363b13289279366': logd: Statistics: Add up to 10 chattiest clients
| | * | | 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 63a14ed7: am ae3ba0b3: am 472e04f2: Merge "logd: liblog: logcat: enable ↵Mark Salyzyn2014-04-0914-149/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | prune features for user" * commit '63a14ed7fc728f84f9496fc99bc1df01b5bc8b16': logd: liblog: logcat: enable prune features for user
| * | | | am ae3ba0b3: am 472e04f2: Merge "logd: liblog: logcat: enable prune features ↵Mark Salyzyn2014-04-0914-149/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | for user" * commit 'ae3ba0b339e7a768fe58f179fdab55f273419e1e': logd: liblog: logcat: enable prune features for user
| | * | | 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 8b4ea5a4: am 39a5b812: am 2baf2886: Merge "Enable world-readable ↵dcashman2014-04-091-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selinuxfs policy binary." * commit '8b4ea5a49dda2767af87604713053e1bc418e96f': Enable world-readable selinuxfs policy binary.
| * | | | | am 39a5b812: am 2baf2886: Merge "Enable world-readable selinuxfs policy binary."dcashman2014-04-091-0/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '39a5b812904ec13390d6261bafccf823729ae21d': Enable world-readable selinuxfs policy binary.
| | * | | | 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
* | | | | | Merge "Add force_encrypt flag to fstab to force encryption on appropriate ↵Paul Lawrence2014-04-093-31/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | devices"
| * | | | | | Add force_encrypt flag to fstab to force encryption on appropriate devicesPaul Lawrence2014-04-043-31/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forceencrypt= will encrypt the drive at boot if it is not encrypted. This change will not have an impact until we set this flag in appropirate fstabs. Bug: 11985952 Change-Id: I6c65eda7f109e4936aa160da50f871703aefb351
* | | | | | | am 7b6a8cba: am 679e2c25: am 9101878d: Merge "logd: fix ↵Greg Hackmann2014-04-071-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LogStatistics::format freeing wrong pointer" * commit '7b6a8cbae956de544f01c43ec0814130aea1f846': logd: fix LogStatistics::format freeing wrong pointer
| * | | | | | am 679e2c25: am 9101878d: Merge "logd: fix LogStatistics::format freeing ↵Greg Hackmann2014-04-071-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong pointer" * commit '679e2c252274a7072c65471d6799a962261e1883': logd: fix LogStatistics::format freeing wrong pointer
| | * | | | | 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 8f2a205f: am 1a09a804: am 47d374ec: Merge "Move date off the non-portable ↵Elliott Hughes2014-04-071-4/+34
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic32 \'strtotimeval\'." * commit '8f2a205f34bfad9eddbd62a073d1ca492276d538': Move date off the non-portable bionic32 'strtotimeval'.
| * | | | | | am 1a09a804: am 47d374ec: Merge "Move date off the non-portable bionic32 ↵Elliott Hughes2014-04-071-4/+34
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'strtotimeval\'." * commit '1a09a804ba0c96182e8193cb5e96090893ad9a7c': Move date off the non-portable bionic32 'strtotimeval'.
| | * | | | | 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
| | | |\ \ \ \