Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | | | | | | | | | | | | | | | | | | | * | | Revert "Change init sequence to support file level encryption" | Paul Lawrence | 2015-07-07 | 6 | -15/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | * | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-06 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-06 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fs_mgr: trigger dm-verity error handling for invalid signatures | Sami Tolvanen | 2015-09-22 | 1 | -7/+47 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "add system-background cpuset" into mnc-dr-dev | Tim Murray | 2015-09-21 | 1 | -0/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | add system-background cpuset | Tim Murray | 2015-09-18 | 1 | -0/+14 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Fo... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to ch... | Narayan Kamath | 2015-09-17 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126e... | Narayan Kamath | 2015-09-12 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE. | Narayan Kamath | 2015-09-12 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6c53de92: Follow up to change b638126ed DO NOT MERGE. | Narayan Kamath | 2015-09-11 | 2 | -9/+4 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to change b638126ed DO NOT MERGE. | Narayan Kamath | 2015-09-10 | 2 | -9/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3:... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) re... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved confli... | Narayan Kamath | 2015-09-20 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b6381... | Narayan Kamath | 2015-09-17 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-mo... | Narayan Kamath | 2015-09-12 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev | Narayan Kamath | 2015-09-12 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for b638126e to klp-modular-dev | Narayan Kamath | 2015-09-10 | 18 | -2188/+155 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | libutils: Fix integer overflows in VectorImpl. DO NOT MERGE | Narayan Kamath | 2015-09-09 | 18 | -2188/+154 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 110f705e: resolved conflicts for 832a0d1c to mnc-dev | Brian Carlstrom | 2015-09-20 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | / / / / / / / / / / / / / / / / / / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for 832a0d1c to mnc-dev | Brian Carlstrom | 2015-09-19 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for cf676a86 to lmp-mr1-ub-dev | Brian Carlstrom | 2015-09-19 | 17 | -2191/+149 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 52edd8bd: am 419e6c3c: libutils: Fix integer overflows in VectorImpl. | Narayan Kamath | 2015-09-17 | 17 | -2190/+148 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 419e6c3c: libutils: Fix integer overflows in VectorImpl. | Narayan Kamath | 2015-09-12 | 17 | -2190/+148 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | libutils: Fix integer overflows in VectorImpl. | Narayan Kamath | 2015-09-09 | 17 | -2190/+148 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "logd: worst uid record watermark part five" into mnc-dr-dev | Mark Salyzyn | 2015-09-14 | 1 | -4/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logd: worst uid record watermark part five | Mark Salyzyn | 2015-09-10 | 1 | -4/+56 | |
| | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logd: klogd and Mediatek | Mark Salyzyn | 2015-09-11 | 2 | -16/+50 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | init: usb: Add configfs commands for USB gadget | Badhri Jagan Sridharan | 2015-09-08 | 1 | -16/+134 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c609c31f: libutils: Fix integer overflows in VectorImpl. | Narayan Kamath | 2015-09-08 | 18 | -2191/+155 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | / / / / / / / / / / / / / / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | libutils: Fix integer overflows in VectorImpl. | Narayan Kamath | 2015-09-02 | 18 | -2191/+155 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "logd: worst uid record watermark part four" into mnc-dr-dev | Mark Salyzyn | 2015-09-04 | 2 | -9/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | logd: worst uid record watermark part four | Mark Salyzyn | 2015-09-04 | 2 | -9/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev | Vincent Palatin | 2015-09-04 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | init.usb.rc: fix USB typec property names | Vincent Palatin | 2015-09-03 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a logging handler on timeout. | Christopher Ferris | 2015-09-03 | 1 | -1/+17 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add zygote to the foreground cpuset. | Tim Murray | 2015-09-02 | 4 | -2/+6 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc... | Tom Cherry | 2015-09-02 | 1 | -24/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE init: Fix parsing of multiple property triggers | Tom Cherry | 2015-09-01 | 1 | -24/+23 | |
| | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | init: usb: Add init scripts for configfs commands | Badhri Jagan Sridharan | 2015-09-01 | 2 | -0/+58 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | init.usb.rc: Add new system property for configfs | Badhri Jagan Sridharan | 2015-09-01 | 1 | -8/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add foreground/boost cpuset." into mnc-dr-dev | Tim Murray | 2015-09-01 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Add foreground/boost cpuset. | Tim Murray | 2015-08-25 | 1 | -0/+6 | |
| | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "fastboot: add flashing bootloader commands" into mnc-dr-dev | Pat Tjin | 2015-09-01 | 1 | -12/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | fastboot: add flashing bootloader commands | Patrick Tjin | 2015-09-01 | 1 | -12/+44 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "logd: worst uid record watermark part three" into mnc-dr-dev | Mark Salyzyn | 2015-09-01 | 1 | -12/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | logd: worst uid record watermark part three | Mark Salyzyn | 2015-08-31 | 1 | -12/+11 |