summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove the arm64 special case.Christopher Ferris2014-04-211-7/+1
| | | | | | The stack-protector option is handled by the global makefiles. Change-Id: I99c4a1624e72ad91ac10eef27c0e3758fe9af8ba
* Merge "libsparse: allow including from C++"Colin Cross2014-04-181-0/+8
|\
| * libsparse: allow including from C++Colin Cross2014-04-181-0/+8
| | | | | | | | Change-Id: I3788fd07e2b52430a410f85fb79dc886c6a07fea
* | Merge "rootdir: init.rc: update max TCP window sizes for mobile networks"JP Abgrall2014-04-181-7/+7
|\ \
| * | rootdir: init.rc: update max TCP window sizes for mobile networksNarayan Reddy2014-04-181-7/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GRPS: RTT=600ms, max tput=80kbps (class 12 GMSK 4+1) EDGE: RTT=300ms, max tput=236kbps (class 12 8PSK) UMTS: RTT=200ms, max tput=384kbps (R99) HSDPA: RTT=75ms, max tput=14Mbps (cat 10) HSUPA: RTT=50ms, max tput=14Mbps HSPA: RTT=50ms, max tput=14Mbps HSPA+: RTT=50ms, max tput=42Mbps (cat 20) LTE: RTT=20ms, max tput=100Mbps (class 3) bug 67569 Change-Id: I9d62359bbd11dc68e3649a7ea2295d0d4e25e3f2 Signed-off-by: Narayan Reddy <narayanr@nvidia.com> Signed-off-by: Steve Lin <stlin@nvidia.com>
* | Merge "Sync persist property immediately,in case of suddenly remove the ↵Colin Cross2014-04-181-0/+1
|\ \ | | | | | | | | | battery."
| * | Sync persist property immediately,in case of suddenly remove the battery.OPPO2014-03-311-0/+1
| | | | | | | | | Change-Id: I83c5812c69db532f4675f5dbfa508e55999c8dfe
* | | Merge "adb: Add USB vendor ID for Prestigio"Colin Cross2014-04-181-0/+3
|\ \ \
| * | | adb: Add USB vendor ID for PrestigioDanielMo2014-04-161-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib9e79043961b9b1fa27d87f5bc815000e7965706 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
* | | | Merge "logd: liblog: logcat: debuggerd: Add LOG_ID_CRASH"Mark Salyzyn2014-04-179-9/+33
|\ \ \ \
| * | | | logd: liblog: logcat: debuggerd: Add LOG_ID_CRASHMark Salyzyn2014-04-169-9/+33
| |/ / / | | | | | | | | | | | | Change-Id: Iea453764a1a4fc1661f461f10c641c30150e4d20
* | | | Merge "logd: libsysutils: logd startup outside init environment"Mark Salyzyn2014-04-178-3/+78
|\ \ \ \
| * | | | logd: libsysutils: logd startup outside init environmentMark Salyzyn2014-04-178-3/+78
| |/ / / | | | | | | | | | | | | Change-Id: I3426b6c3eebdd0c8258e966dcaaaa2825d7a23d1
* | | | Merge changes I487ebe67,Ie7a0aeb2Mark Salyzyn2014-04-171-44/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: libutils: FileMap styling adjustments libutils: FileMap 64 bit compile issues
| * | | | libutils: FileMap styling adjustmentsMark Salyzyn2014-04-171-35/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: I487ebe67a46a7b8f680e722141dd216bbd396f3e
| * | | | libutils: FileMap 64 bit compile issuesMark Salyzyn2014-04-171-9/+10
|/ / / / | | | | | | | | | | | | Change-Id: Ie7a0aeb2a7e2d2a90aa2b97c657ea7ec566bf793
* | | | Merge "libutils: BlobCache 64 bit compile issues"Mark Salyzyn2014-04-171-13/+14
|\ \ \ \ | |/ / / |/| | |
| * | | libutils: BlobCache 64 bit compile issuesMark Salyzyn2014-04-171-13/+14
|/ / / | | | | | | | | | Change-Id: I60e9bddfff04f19834b83bdc26a83ca7173363c3
* | | Merge "logd: Add logd_test"Mark Salyzyn2014-04-153-0/+666
|\ \ \
| * | | logd: Add logd_testMark Salyzyn2014-04-153-0/+666
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Test statistics output, all four main log id types are checked to be present, and output is properly formatted with header (ascii new-line terminated byte count) and trailer (newline formfeed) frames. * On dev build test dgram_qlen, circumvent if liblog benchmarks executed first though. * Test if kernel and user space loggers are present, and if any content has leaked to both. * test benchmark and use it to verify worst UID pruning Change-Id: I890c89f64825956f40108de806ed750b0170ac6c
* | | | Merge "Avoid logging functions from signal handler."Christopher Ferris2014-04-152-8/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid logging functions from signal handler.Christopher Ferris2014-04-152-8/+14
|/ / / | | | | | | | | | | | | | | | (cherry picked from commit 9007677fcbcd7cf01725e155920a8abfcb323c56) Change-Id: Ic0163f43308c6a281ab3757d90933e5127843fed
* | | Merge "HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME."Narayan Kamath2014-04-151-2/+4
|\ \ \
| * | | HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.Narayan Kamath2014-04-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Include 64bit valgrind in the android_filesystem_config."Narayan Kamath2014-04-141-0/+1
|\ \ \ \
| * | | | Include 64bit valgrind in the android_filesystem_config.Narayan Kamath2014-04-121-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Required so that we set the exectuable bit correctly. Change-Id: If59bd0ff47d2b4b2b8f92a1c007b4ba414ea1876
* | | | Merge "Fix buffer overflow in syren utility"Colin Cross2014-04-131-2/+6
|\ \ \ \
| * | | | Fix buffer overflow in syren utilitynks2014-04-131-2/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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>
* | | | | 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 "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 "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
* | | | 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
* | | 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
* | | | 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 "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>
* | | | 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
* | | | | 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
* | | | 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