summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix scanf %s in lsof.Elliott Hughes2016-05-271-3/+4
| | | | | Bug: http://b/28175237 Change-Id: Ief0ba299b09693ad9afc0e3d17a8f664c2fbb8c2
* Fix overflow in path buildingDaniel Rosenberg2016-04-211-1/+1
| | | | | | | | | An incorrect size was causing an unsigned value to wrap, causing it to write past the end of the buffer. Bug: 28085658 Change-Id: Ie9625c729cca024d514ba2880ff97209d435a165
* Don't demangle symbol names.Josh Gao2016-03-251-16/+0
| | | | | Bug: http://b/27299236 Change-Id: I26ef47f80d4d6048a316ba51e83365ff65d70439
* Don't create tombstone directory.Josh Gao2016-02-261-14/+1
| | | | | | | Partial backport of cf79748. Bug: http://b/26403620 Change-Id: Ib877ab6cfab6aef079830c5a50ba81141ead35ee
* Re-derive permissions after package changes.Jeff Sharkey2016-02-161-0/+16
| | | | | | | | | | | | | | | | When packages change, existing package-specific directories may have gained/lost a UID mapping, so we need to update the permissions for any in-memory nodes. This allows an app to deliver data for another package before that package is installed, which is the typical pattern of how OBB files are delivered. Also fix bug by re-deriving permissions when files are moved. Bug: 25399427 Change-Id: I06f38a24ad7dee5f5099ba81429aef03208e5683 (cherry picked from commit f7aad11c1cc133e352333f83e3abbf323cd41ead)
* merge in mnc-mr1-release history after reset to mnc-dr-devThe Android Automerger2015-12-170-0/+0
|\
| * merge in mnc-mr1-release history after reset to mnc-dr-devThe Android Automerger2015-12-150-0/+0
| |\ | |/ |/|
* | Fix incorrect check of descsz value.Christopher Ferris2015-12-101-4/+4
|/ | | | | | | | Bug: 25187394 (cherry picked from commit 1fa55234d6773e09e3bb934419b5b6cc0df981c9) Change-Id: Idbc9071e8b2b25a062c4e94118808d6e19d443d9
* Add macro to call event logger for errors.William Luh2015-12-014-1/+494
| | | | | Bug:23180694 Change-Id: I566a290334345f48013029534efef3e08e726e40
* logd: pruning time horizonMark Salyzyn2015-11-041-1/+4
| | | | | | | | Estimate a time horizon of ten fold for worst UID pruning Bug: 25453210 Bug: 24782000 Change-Id: I7118deb6d42531c68ed2ac2a59c57b0580b942cc
* Remove __DATE__/__TIME__ from init and debuggerdDan Willemsen2015-11-032-2/+2
| | | | | | | | | | | | | | Keeping these means that every build has different init and debuggerd binaries, even if the source was the same. So OTAs that don't touch these sources would still need to update the binaries. Both of these messages are only informational, so can be safely removed. Bootchart already encodes build-specific information from the system properties. Bug: 24204119 Change-Id: I7ebd65a20a3e031e7528c9f741616e20b3cd7446 (cherry picked from commit 30622bbb209db187f6851e4cf0cdaa147c2fca9f)
* Merge "Don't show UI on default encryption" into mnc-dr-devPaul Lawrence2015-10-211-1/+1
|\
| * Don't show UI on default encryptionPaul Lawrence2015-09-091-1/+1
| | | | | | | | | | Bug: 22989588 Change-Id: I8e7023767f1da80c872adc45871be1f8851926ad
* | Reorder init.rc to avoid a kernel warning.Tim Murray2015-10-151-9/+13
| | | | | | | | | | | | | | | | | | | | 3.18 has a warning in dmesg that appears when the parent cpuset's cpus and mems are changed to something other than what the child has. Reorder init.rc to prevent this warning from appearing. bug 24941443 Change-Id: I49d8394063b23dce03222dcc9ddccdc32bb97ea2
* | Merge "healthd: Adds fake battery properties for devices with no battery." ↵Ruchi Kandoi2015-10-122-1/+19
|\ \ | | | | | | | | | into mnc-dr-dev
| * | healthd: Adds fake battery properties for devices with no battery.Ruchi Kandoi2015-10-122-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devices which have no battery and are always plugged in will not have any battery property initialized. This causes the 'stable power' to never be switched which is required for updating apps. This change recognizes such a device and manually sets the battery to 100% and charger status to connected to AC mains. It will also fake the battery temperature. Bug: 24258855 Change-Id: I98e5ed0dbeb7f2ab6d3802cd7e0f3a269bd8f31f Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
* | | fs_mgr: trigger dm-verity error handling for invalid signaturesSami Tolvanen2015-09-221-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the device doesn't mount verified partitions if the verity table signature is invalid, which usually means it fails to boot. This change instead sets up dm-verity with an invalid root hash and triggers device-specific error handling to recover from the corruption. Bug: 24256506 Change-Id: I6d693306fa0e7459c5500b028e433df61ecea6fb (cherry picked from commit 47caa5c386b436ba13de9f2ef356380f39afaf3f)
* | | Merge "add system-background cpuset" into mnc-dr-devTim Murray2015-09-211-0/+14
|\ \ \
| * | | add system-background cpusetTim Murray2015-09-181-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a new cpuset for system services that should not run on larger cores bug 24144797 Change-Id: I21a54f0d6b46b3b8bd8c4564b8685c88cfc4a57d
* | | | am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: ↵Narayan Kamath2015-09-200-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. * commit '3f7a33a5294cd59c331d5d036021141b6f1aef1e': Follow up to change b638126ed DO NOT MERGE.
| * \ \ \ am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: ↵Narayan Kamath2015-09-200-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. * commit '26d47f2671e67968ea408417f03844681faf9455': Follow up to change b638126ed DO NOT MERGE.
| | * \ \ \ am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: ↵Narayan Kamath2015-09-200-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to change b638126ed DO NOT MERGE. * commit '491035ce1ceec310f98347654ea17cafa6ccb520': Follow up to change b638126ed DO NOT MERGE.
| | | * \ \ \ am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to ↵Narayan Kamath2015-09-170-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change b638126ed DO NOT MERGE. * commit '8253cb0436a09dcb325dbdecf4689b0a18b25644': Follow up to change b638126ed DO NOT MERGE.
| | | | * \ \ \ am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change ↵Narayan Kamath2015-09-120-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b638126ed DO NOT MERGE. * commit '0cc468dc2a1420d5c9dac563cc6c5d11b862ff47': Follow up to change b638126ed DO NOT MERGE.
| | | | | * \ \ \ am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.Narayan Kamath2015-09-120-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fef9dffd96e8bc6f2283a57cd0b29df4be43eb46': Follow up to change b638126ed DO NOT MERGE.
| | | | | | * \ \ \ am 6c53de92: Follow up to change b638126ed DO NOT MERGE.Narayan Kamath2015-09-112-9/+4
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6c53de92cf7e759488538280788325fac6ccdea2': Follow up to change b638126ed DO NOT MERGE.
| | | | | | | * | | | Follow up to change b638126ed DO NOT MERGE.Narayan Kamath2015-09-102-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves delta between the kitkat and L version of this patch. Fixes the molly build on klp-dev. bug: 22953624 Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36
* | | | | | | | | | | am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am ↵Narayan Kamath2015-09-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev * commit 'dd0932e831551d0a57a8af646ac0f9f386e4f579': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
| * | | | | | | | | | am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) ↵Narayan Kamath2015-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for b638126e to klp-modular-dev * commit '81b428f27a74f693b7c19b873c3a5a9af69da641': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
| | * | | | | | | | | am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved ↵Narayan Kamath2015-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts for b638126e to klp-modular-dev * commit 'db7d8e963c54246a2792e91c678bbe00fb2cc3aa': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
| | | * | | | | | | | am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for ↵Narayan Kamath2015-09-170-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b638126e to klp-modular-dev * commit '68a7837088c40e367ebf16959adc9d20d06ef0ea': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
| | | | * | | | | | | am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to ↵Narayan Kamath2015-09-120-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '2e64e9590a36511eaaf655b24002d24afe927f04': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
| | | | | * | | | | | am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-devNarayan Kamath2015-09-120-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
| | | | | | * | | | | resolved conflicts for b638126e to klp-modular-devNarayan Kamath2015-09-1018-2188/+155
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5062b01afa95279ab25fe86aaafa89d4d74eaa1
| | | | | | | * | | | libutils: Fix integer overflows in VectorImpl. DO NOT MERGENarayan Kamath2015-09-0918-2188/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use external/safe-iop to check for overflows on arithmetic operations. Also remove an unnecessary copy of Vector/SharedBuffer from codeflinger and use the copy from libutils instead. Note that some of the unit tests are somewhat useless due to test-runner limitations : gtest's ability to filter on abort message doesn't work when combined with messages formatted by android's logging system. bug: 22953624 (cherry picked from commit c609c31fb56ae434caa2d0153cd0a2f74a715071) Change-Id: I673b7ab142bed4fcba9159a00a65cf6bca6b1f6c
* | | | | | | | | | | am 110f705e: resolved conflicts for 832a0d1c to mnc-devBrian Carlstrom2015-09-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | | * commit '110f705e1077b388a69814e9cdd2907a6ad7d5bb': libutils: Fix integer overflows in VectorImpl.
| * | | | | | | | | resolved conflicts for 832a0d1c to mnc-devBrian Carlstrom2015-09-191-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9
| | * | | | | | | | resolved conflicts for cf676a86 to lmp-mr1-ub-devBrian Carlstrom2015-09-1917-2191/+149
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c
| | | * | | | | | | am 52edd8bd: am 419e6c3c: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-1717-2190/+148
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52edd8bdf3e83f41f4df4bb5e9e44d0bc0c56a37': libutils: Fix integer overflows in VectorImpl.
| | | | * | | | | | am 419e6c3c: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-1217-2190/+148
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '419e6c3c68413bd6dbb6872340b2ae0d69a0fd60': libutils: Fix integer overflows in VectorImpl.
| | | | | * | | | | libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-0917-2190/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use external/safe-iop to check for overflows on arithmetic operations. Also remove an unnecessary copy of Vector/SharedBuffer from codeflinger and use the copy from libutils instead. Note that some of the unit tests are somewhat useless due to test-runner limitations : gtest's ability to filter on abort message doesn't work when combined with messages formatted by android's logging system. bug: 22953624 (cherry picked from commit c609c31fb56ae434caa2d0153cd0a2f74a715071) Change-Id: I61644633db6b54fa230683615de9724f7fabf6fb
* | | | | | | | | | Merge "logd: worst uid record watermark part five" into mnc-dr-devMark Salyzyn2015-09-141-4/+56
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | logd: worst uid record watermark part fiveMark Salyzyn2015-09-101-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 5bb2972dce918b60f1ed9ddc6fe0636e97679187) A regression that resulted in increased memory consumption for some logging patterns because we rarely did merge or leading checks, and age-out checking. On the last prune cycle, we reset for a full scan. Add some comments describing the pruning processes. Bug: 23327476 Bug: 23681639 Bug: 23685592 Change-Id: I22b0f339c9269b006831fda9cefe295a263ebb92
* | | | | | | | | | logd: klogd and MediatekMark Salyzyn2015-09-112-16/+50
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 46d159d4626ca5d5667b739792840c3178a1457b) - sniff for PID in kernel log messages if available - properly deal with klogd watermark in face of modified output - deal more stringently with priority tag, must have [ following - suppress process-name stutter in tag that can happen - do not use : to demark tag if within [ ] Mediatek-special change that adds <printk_state>(<cpu>)[<pid>:<comm>] as a prefix to the printk messages. Along the lines of (simplified for entertainment purposes, YMMV): char tbuf[50]; /* printk prefix */ int this_cpu = smp_processor_id(); char state = __raw_get_cpu_var(printk_state); unsigned tlen = snprintf(tbuf, sizeof(tbuf), "%c(%x)[%d:%s]", state, this_cpu, current->pid, current->comm); Bug: 23517551 Change-Id: I568e25c5aa6d8474835454a0e83b19c2921b7985
* | | | | | | | | init: usb: Add configfs commands for USB gadgetBadhri Jagan Sridharan2015-09-081-16/+134
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds init support for: accessory audio_source midi adb rndis Bug=23633457 Change-Id: I12e68e25969adafcf3170769f91ae939d08b7dbc
* | | | | | | | am c609c31f: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-0818-2191/+155
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c609c31fb56ae434caa2d0153cd0a2f74a715071': libutils: Fix integer overflows in VectorImpl.
| * | | | | | | libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-0218-2191/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use external/safe-iop to check for overflows on arithmetic operations. Also remove an unnecessary copy of Vector/SharedBuffer from codeflinger and use the copy from libutils instead. Note that some of the unit tests are somewhat useless due to test-runner limitations : gtest's ability to filter on abort message doesn't work when combined with messages formatted by android's logging system. bug: 22953624 Change-Id: I46b1ae8ca1f3a010be13aca36a091e76a97a7b70
* | | | | | | | Merge "logd: worst uid record watermark part four" into mnc-dr-devMark Salyzyn2015-09-042-9/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | logd: worst uid record watermark part fourMark Salyzyn2015-09-042-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 831aa297307a038705bc771281ffd53266484b4a) With part deux we caused an apparent regression by not checking for stale recorded iterators. This checking was on-purpose bypassesed when leading prune entries were to be deleted without touching the statistics engine due to an in-place merge. Part deux had us leaving iterators we were not focussed on untouched which in turn because they were left behind, had a much higher likelihood of being deleted without touching the statistics engine. Perform the check every delete. Bug: 23789348 Bug: 23490267 Change-Id: Idc6cc23d1f9e3b6cd9a083139a0de59479fbfe08
* | | | | | | | | Merge "init.usb.rc: fix USB typec property names" into mnc-dr-devVincent Palatin2015-09-041-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |