summaryrefslogtreecommitdiffstats
path: root/fs_mgr
Commit message (Expand)AuthorAgeFilesLines
* fs_mgr: trigger dm-verity error handling for invalid signaturesSami Tolvanen2015-09-221-7/+47
* Update partition.*.verified even with ro.boot.veritymode setSami Tolvanen2015-07-151-5/+11
* fs_config: replace getenv('OUT') by new fs_config parameterThierry Strudel2015-07-091-1/+1
* fs_mgr: Use ro.boot.veritymodeSami Tolvanen2015-07-081-1/+24
* DO NOT MERGE Securely encrypt the master keyPaul Lawrence2015-05-291-11/+1
* Don't use TEMP_FAILURE_RETRY on close in system/core.Elliott Hughes2015-05-272-10/+10
* am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to b...Iliyan Malchev2015-05-131-1/+21
|\
| * am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified a...Iliyan Malchev2015-05-121-1/+21
| |\
| | * Merge "fs_mgr: allow for zramsize to be specified as percentage of total memo...Iliyan Malchev2015-05-121-1/+21
| | |\
| | | * fs_mgr: allow for zramsize to be specified as percentage of total memoryIliyan Malchev2015-05-011-1/+21
* | | | am 92f075aa: am 48ba7587: am 34dd04db: Merge "Improve bad error reporting see...Elliott Hughes2015-04-241-1/+4
|\ \ \ \ | |/ / /
| * | | am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SE...Elliott Hughes2015-04-241-1/+4
| |\ \ \
| | * | | Improve bad error reporting seen in shamu SELinux boot failures.Elliott Hughes2015-04-241-1/+4
* | | | | resolved conflicts for merge of d0b6de41 to masterEd Tam2015-04-136-5/+171
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aospEd Tam2015-04-136-5/+171
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | fs_mgr: introduce fs_mgr_format to format wiped partitionsChris Fries2015-04-106-3/+171
* | | | am d087e6f3: am 7a91e93e: am be940153: Merge "Revert "Revert "fs_mgr_verity: ...Mohamad Ayyash2015-04-092-27/+54
|\ \ \ \ | |/ / /
| * | | Revert "Revert "fs_mgr_verity: Add support for squashfs""Mohamad Ayyash2015-04-082-27/+54
* | | | am 0009bacf: am d71eca9e: am e322ae19: Merge "Revert "fs_mgr_verity: Add supp...Mohamad Ayyash2015-04-082-39/+26
|\ \ \ \ | |/ / /
| * | | Merge "Revert "fs_mgr_verity: Add support for squashfs""Mohamad Ayyash2015-04-082-39/+26
| |\ \ \
| | * | | Revert "fs_mgr_verity: Add support for squashfs"Mohamad Ayyash2015-04-082-39/+26
* | | | | am d411d14a: am 48bfdb85: am 70f81cee: Merge "fs_mgr_verity: Add support for ...Mohamad Ayyash2015-04-082-26/+39
|\ \ \ \ \ | |/ / / /
| * | | | Merge "fs_mgr_verity: Add support for squashfs"Mohamad Ayyash2015-04-082-26/+39
| |\ \ \ \ | | |/ / /
| | * | | fs_mgr_verity: Add support for squashfsMohamad Ayyash2015-04-062-26/+39
* | | | | am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verif...Sami Tolvanen2015-04-071-20/+117
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Restore verity state when verified partition is reflashed"Sami Tolvanen2015-04-071-20/+117
| |\ \ \ \
| | * | | | Restore verity state when verified partition is reflashedSami Tolvanen2015-03-311-20/+117
* | | | | | am 93c4b6c8: am ddaebb24: am 284c5cb2: Merge "Set verity mode as the verified...Sami Tolvanen2015-04-072-31/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Set verity mode as the verified property value"Sami Tolvanen2015-04-072-31/+37
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Set verity mode as the verified property valueSami Tolvanen2015-03-312-31/+37
* | | | | Merge "Revert "Revert "Adding e4crypt support"""Paul Lawrence2015-04-024-27/+102
|\ \ \ \ \
| * | | | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-04-014-27/+102
* | | | | | am 1c4cdf72: am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr."Dan Albert2015-04-021-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Link libc++_static into fs_mgr.Dan Albert2015-04-011-0/+1
| * | | | Revert "Revert "Adding e4crypt support""Paul Lawrence2015-03-314-27/+102
| |/ / /
* | | | am 825c2655: am 6ca1dbd4: am 6baab44e: Merge "Fix build"Sami Tolvanen2015-03-261-15/+14
|\ \ \ \ | |/ / /
| * | | Fix buildSami Tolvanen2015-03-261-15/+14
* | | | am c28e2598: am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for verit...Sami Tolvanen2015-03-263-63/+197
|\ \ \ \ | |/ / /
| * | | Use structured format for verity metadataSami Tolvanen2015-03-243-63/+197
* | | | Revert "Adding e4crypt support"Paul Lawrence2015-03-264-104/+30
* | | | Adding e4crypt supportPaul Lawrence2015-03-234-30/+104
* | | | am 54bac178: am ddd0639e: Merge "Add init command to set verified properties"Sami Tolvanen2015-03-202-7/+20
|\ \ \ \ | |/ / /
| * | | Add init command to set verified propertiesSami Tolvanen2015-03-192-7/+20
* | | | am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init t...Sami Tolvanen2015-03-111-27/+1
|\ \ \ \ | |/ / /
| * | | Merge "Do not call libcutils property_set in init through libfs_mgr"Sami Tolvanen2015-03-111-27/+1
| |\ \ \
| | * | | Do not call libcutils property_set in init through libfs_mgrSami Tolvanen2015-03-051-27/+1
* | | | | fs_mgr: recognize a notrim mountpoint flagJP Abgrall2015-03-053-0/+8
|/ / / /
* | | | am 291ce5b8: Merge "Fs_mgr: Fix format code"Andreas Gampe2015-03-041-1/+1
|\ \ \ \ | |/ / /
| * | | Fs_mgr: Fix format codeAndreas Gampe2015-03-041-1/+1
* | | | am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"Sami Tolvanen2015-03-042-10/+343
|\ \ \ \ | |/ / /