summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 110f705e: resolved conflicts for 832a0d1c to mnc-devBrian Carlstrom2015-09-201-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | / / / / / / / / / / / / / / / / / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for 832a0d1c to mnc-devBrian Carlstrom2015-09-191-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for cf676a86 to lmp-mr1-ub-devBrian Carlstrom2015-09-1917-2191/+149
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 52edd8bd: am 419e6c3c: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-1717-2190/+148
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | am 419e6c3c: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-1217-2190/+148
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-0917-2190/+148
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | logd: klogd and MediatekMark Salyzyn2015-09-112-16/+50
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | init: usb: Add configfs commands for USB gadgetBadhri Jagan Sridharan2015-09-081-16/+134
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am c609c31f: libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-0818-2191/+155
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | / / / / / / / / / / / / / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | libutils: Fix integer overflows in VectorImpl.Narayan Kamath2015-09-0218-2191/+155
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "init.usb.rc: fix USB typec property names" into mnc-dr-devVincent Palatin2015-09-041-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | init.usb.rc: fix USB typec property namesVincent Palatin2015-09-031-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add a logging handler on timeout.Christopher Ferris2015-09-031-1/+17
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add zygote to the foreground cpuset.Tim Murray2015-09-024-2/+6
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc...Tom Cherry2015-09-021-24/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE init: Fix parsing of multiple property triggersTom Cherry2015-09-011-24/+23
| | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | init: usb: Add init scripts for configfs commandsBadhri Jagan Sridharan2015-09-012-0/+58
| * | | | | | | | | | | | | | | | | | | | | | | | | init.usb.rc: Add new system property for configfsBadhri Jagan Sridharan2015-09-011-8/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add foreground/boost cpuset." into mnc-dr-devTim Murray2015-09-011-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Add foreground/boost cpuset.Tim Murray2015-08-251-0/+6
| | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "fastboot: add flashing bootloader commands" into mnc-dr-devPat Tjin2015-09-011-12/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | fastboot: add flashing bootloader commandsPatrick Tjin2015-09-011-12/+44
| | | |/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "logd: worst uid record watermark part three" into mnc-dr-devMark Salyzyn2015-09-011-12/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | logd: worst uid record watermark part threeMark Salyzyn2015-08-311-12/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "logd: worst uid record watermark part deux" into mnc-dr-devMark Salyzyn2015-09-011-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | logd: worst uid record watermark part deuxMark Salyzyn2015-08-311-1/+5
| | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | healthd: logd: add timestamp to kernel logged battery messagesMark Salyzyn2015-08-272-5/+39
| * | | | | | | | | | | | | | | | | | | | | | | | | logd: refine is_prioMark Salyzyn2015-08-271-9/+15
| |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am d239dbb2: am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 ...Bart Sears2015-08-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am 5b33306d: Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" in...Abhishek Arya2015-08-263-1/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 09a474ac: am ba4e6a80: (-s ours) am bd7dd79e: am 25592fbe: am ca15dfd0: am...Sergio Giro2015-08-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | adbd: enable USB SuperSpeed (again)Jack Pham2015-08-241-1/+49
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge changes I9f21ce95,Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4, ... into mnc...Mark Salyzyn2015-08-246-34/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | logd: worst uid record watermarkMark Salyzyn2015-08-202-1/+23
| | * | | | | | | | | | | | | | | | | | | | | | | | logd: log buffer switch to std::listMark Salyzyn2015-08-201-2/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | logd: white and black switch to std::listMark Salyzyn2015-08-202-19/+13
| | * | | | | | | | | | | | | | | | | | | | | | | | logd: logtimes switch to std::listMark Salyzyn2015-08-202-4/+6
| | * | | | | | | | | | | | | | | | | | | | | | | | logd: prune 10% or 256 entries maxMark Salyzyn2015-08-201-11/+7
| | * | | | | | | | | | | | | | | | | | | | | | | | logd: sizes > 1M prune in smaller batchesMark Salyzyn2015-08-201-8/+15
| | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17:...Abhishek Arya2015-08-211-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3fa8b550: am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe:...Sergio Giro2015-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e0ab2322: Display the map offset for each frame.Christopher Ferris2015-08-202-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use init to write usb typec props" into mnc-dr-devTim Kilbourn2015-08-181-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Use init to write usb typec propsTim Kilbourn2015-08-171-0/+31
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mn...Sergio Giro2015-08-181-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 19f223f3: Merge "[gatekeeperd] Check parent profile for SID lookups" into ...Andres Morales2015-08-064-2/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \