| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge "Revert "Revert "Adding e4crypt support""" | Paul Lawrence | 2015-04-02 | 4 | -27/+102 |
|\ |
|
| * | Revert "Revert "Adding e4crypt support"" | Paul Lawrence | 2015-04-01 | 4 | -27/+102 |
* | | am 1c4cdf72: am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr." | Dan Albert | 2015-04-02 | 1 | -0/+1 |
|\ \
| |/
|/| |
|
| * | Link libc++_static into fs_mgr. | Dan Albert | 2015-04-01 | 1 | -0/+1 |
| * | Revert "Revert "Adding e4crypt support"" | Paul Lawrence | 2015-03-31 | 4 | -27/+102 |
* | | am 825c2655: am 6ca1dbd4: am 6baab44e: Merge "Fix build" | Sami Tolvanen | 2015-03-26 | 1 | -15/+14 |
|\ \
| |/ |
|
| * | Fix build | Sami Tolvanen | 2015-03-26 | 1 | -15/+14 |
* | | am c28e2598: am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for verit... | Sami Tolvanen | 2015-03-26 | 3 | -63/+197 |
|\ \
| |/ |
|
| * | Use structured format for verity metadata | Sami Tolvanen | 2015-03-24 | 3 | -63/+197 |
* | | Revert "Adding e4crypt support" | Paul Lawrence | 2015-03-26 | 4 | -104/+30 |
* | | Adding e4crypt support | Paul Lawrence | 2015-03-23 | 4 | -30/+104 |
* | | am 54bac178: am ddd0639e: Merge "Add init command to set verified properties" | Sami Tolvanen | 2015-03-20 | 2 | -7/+20 |
|\ \
| |/ |
|
| * | Add init command to set verified properties | Sami Tolvanen | 2015-03-19 | 2 | -7/+20 |
* | | am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init t... | Sami Tolvanen | 2015-03-11 | 1 | -27/+1 |
|\ \
| |/ |
|
| * | Merge "Do not call libcutils property_set in init through libfs_mgr" | Sami Tolvanen | 2015-03-11 | 1 | -27/+1 |
| |\ |
|
| | * | Do not call libcutils property_set in init through libfs_mgr | Sami Tolvanen | 2015-03-05 | 1 | -27/+1 |
* | | | fs_mgr: recognize a notrim mountpoint flag | JP Abgrall | 2015-03-05 | 3 | -0/+8 |
|/ / |
|
* | | am 291ce5b8: Merge "Fs_mgr: Fix format code" | Andreas Gampe | 2015-03-04 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Fs_mgr: Fix format code | Andreas Gampe | 2015-03-04 | 1 | -1/+1 |
* | | am a88fb24a: Merge "Add fs_mgr support for dm-verity modes" | Sami Tolvanen | 2015-03-04 | 2 | -10/+343 |
|\ \
| |/ |
|
| * | Merge "Add fs_mgr support for dm-verity modes" | Sami Tolvanen | 2015-03-04 | 2 | -10/+343 |
| |\ |
|
| | * | Add fs_mgr support for dm-verity modes | Sami Tolvanen | 2015-03-04 | 2 | -10/+343 |
* | | | am fbb3f8ca: Merge "Set underlying block device RO when enabling verity" | Sami Tolvanen | 2015-02-28 | 3 | -6/+14 |
|\ \ \
| |/ / |
|
| * | | Set underlying block device RO when enabling verity | Sami Tolvanen | 2015-02-27 | 3 | -6/+14 |
| |/ |
|
* | | Merge commit '9c1bc6bbc82e3e4f005e9fcacfca94b2dd82ca31' into HEAD | Bill Yi | 2015-02-19 | 4 | -11/+8 |
|\ \
| |/
|/| |
|
| * | am 317b4024: Revert "Make encryption configurable" | Paul Lawrence | 2015-02-07 | 3 | -7/+3 |
| |\ |
|
| | * | Revert "Make encryption configurable" | Paul Lawrence | 2015-02-06 | 3 | -7/+3 |
| * | | am 17b5b352: Merge "fs_mgr: error check umount calls / add retry logic" | Nick Kralevich | 2015-02-06 | 2 | -3/+14 |
| |\ \ |
|
| * \ \ | am bda62724: Make encryption configurable | Paul Lawrence | 2015-01-26 | 3 | -3/+7 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Make encryption configurable | Paul Lawrence | 2015-01-21 | 3 | -3/+7 |
| * | | | am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab" | Elliott Hughes | 2015-01-23 | 1 | -0/+91 |
| |\ \ \ |
|
| * \ \ \ | am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab"" | Elliott Hughes | 2015-01-23 | 1 | -91/+0 |
| |\ \ \ \ |
|
| * \ \ \ \ | am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab" | JP Abgrall | 2015-01-23 | 1 | -0/+91 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | am f2bd3fdd: Merge "Provide a way to select force encryption from vendor part... | Leo Wang | 2015-01-09 | 1 | -1/+12 |
| |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | | |
|
| | * | | | | | Provide a way to select force encryption from vendor partition | Paul Lawrence | 2015-01-07 | 1 | -1/+12 |
| * | | | | | | am a97c1075: Merge "Fix Nick\'s nits" | Elliott Hughes | 2014-12-10 | 1 | -4/+4 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | am 294e610f: Merge "Fix verity on system partitions larger than 2G" | Elliott Hughes | 2014-12-10 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | resolved conflicts for merge of b471f524 to lmp-mr1-dev-plus-aosp | Elliott Hughes | 2014-12-09 | 1 | -11/+8 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | am 72f0d92c: DO NOT MERGE: Do not mount devices with invalid verity metadata | Sami Tolvanen | 2014-11-14 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | | | | | |
|
| | * | | | | | | | | DO NOT MERGE: Do not mount devices with invalid verity metadata | Sami Tolvanen | 2014-11-13 | 1 | -1/+3 |
| * | | | | | | | | | am 9573a13b: DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 | Sami Tolvanen | 2014-11-14 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / / |
|
| | * | | | | | | | | DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1 | Sami Tolvanen | 2014-11-13 | 1 | -3/+3 |
| * | | | | | | | | | fs_mgr: let fsck.f2fs actually attempt a fix | JP Abgrall | 2014-11-12 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / / |
|
| | * | | | | | | | | fs_mgr: let fsck.f2fs actually attempt a fix | JP Abgrall | 2014-11-08 | 1 | -1/+2 |
| * | | | | | | | | | am 4cafe2ff: Fix verity on system partitions larger than 2G | Sami Tolvanen | 2014-10-31 | 1 | -22/+26 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / / |
|
| | * | | | | | | | | Fix verity on system partitions larger than 2G | Sami Tolvanen | 2014-10-29 | 1 | -22/+26 |
| * | | | | | | | | | am 97e48731: Fix Nick\'s nits | Paul Lawrence | 2014-10-10 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / / |
|
| | * | | | | | | | | Fix Nick's nits | Paul Lawrence | 2014-10-09 | 1 | -4/+4 |
| * | | | | | | | | | resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp | Paul Lawrence | 2014-10-10 | 6 | -28/+87 |
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / / |
|
| | * | | | | | | | | Revert "Revert "Enable verity on userdebug, and add disable-verity to adb"" | Paul Lawrence | 2014-10-09 | 6 | -28/+87 |