summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | | | | | * | Revert "Change init sequence to support file level encryption"Paul Lawrence2015-07-076-15/+17
| | | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | fs_mgr: trigger dm-verity error handling for invalid signaturesSami Tolvanen2015-09-221-7/+47
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "add system-background cpuset" into mnc-dr-devTim Murray2015-09-211-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | add system-background cpusetTim Murray2015-09-181-0/+14
| | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am...Narayan Kamath2015-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-...Narayan Kamath2015-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Fo...Narayan Kamath2015-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to ch...Narayan Kamath2015-09-170-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126e...Narayan Kamath2015-09-120-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.Narayan Kamath2015-09-120-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6c53de92: Follow up to change b638126ed DO NOT MERGE.Narayan Kamath2015-09-112-9/+4
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Follow up to change b638126ed DO NOT MERGE.Narayan Kamath2015-09-102-9/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3:...Narayan Kamath2015-09-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) re...Narayan Kamath2015-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved confli...Narayan Kamath2015-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b6381...Narayan Kamath2015-09-170-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-mo...Narayan Kamath2015-09-120-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-devNarayan Kamath2015-09-120-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for b638126e to klp-modular-devNarayan Kamath2015-09-1018-2188/+155
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | libutils: Fix integer overflows in VectorImpl. DO NOT MERGENarayan Kamath2015-09-0918-2188/+154
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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