summaryrefslogtreecommitdiffstats
path: root/fs_mgr
Commit message (Expand)AuthorAgeFilesLines
* Merge "Mount /vendor and /odm early"Hung-ying Tyan2016-08-184-27/+45
|\
| * Mount /vendor and /odm earlyHung-ying Tyan2016-08-174-27/+45
* | Merge "libcrypto_utils: convert to Soong."Josh Gao2016-08-081-2/+2
|\|
| * libcrypto_utils: convert to Soong.Josh Gao2016-08-051-2/+2
* | Merge \"Fix clang-tidy performance warnings in fs_mgr.\"Chih-Hung Hsieh2016-07-281-1/+1
|\|
| * Fix clang-tidy performance warnings in fs_mgr.Chih-Hung Hsieh2016-07-271-1/+1
* | Merge \"Make klog_fd thread-safe and make klog_init a no-op.\"Elliott Hughes2016-07-081-2/+0
|\|
| * Make klog_fd thread-safe and make klog_init a no-op.Elliott Hughes2016-06-291-2/+0
* | Merge \\"fs_mgr: Track the bootloader_message struct change.\\" am: 4d34653720Tao Bao2016-06-141-1/+1
|\|
| * Merge "fs_mgr: Track the bootloader_message struct change."Tao Bao2016-06-141-1/+1
| |\
| | * fs_mgr: Track the bootloader_message struct change.Tao Bao2016-06-091-1/+1
| * | fs_mgr: validate corrected signaturesSami Tolvanen2016-06-081-2/+13
| |/
* | Merge "fs_mgr: Remove incorrect free() on error paths in load_key()" am: 35d8...Mattias Nissler2016-06-071-3/+0
|\|
| * Merge "fs_mgr: Remove incorrect free() on error paths in load_key()"Mattias Nissler2016-06-071-3/+0
| |\
| | * fs_mgr: Remove incorrect free() on error paths in load_key()Mattias Nissler2016-06-071-3/+0
* | | Merge "fs_mgr: fix encryptable=footer support" am: b67fed557fChuanxiao Dong2016-06-073-5/+14
|\| |
| * | Merge "fs_mgr: fix encryptable=footer support"Treehugger Robot2016-06-073-5/+14
| |\ \ | | |/ | |/|
| | * fs_mgr: fix encryptable=footer supportChuanxiao Dong2016-03-083-5/+14
* | | resolve merge conflicts of eacbb82 to nyc-dev-plus-aospSami Tolvanen2016-06-061-2/+13
|\ \ \
| * | | fs_mgr: validate corrected signaturesSami Tolvanen2016-06-061-2/+13
* | | | resolve merge conflicts of adadb7d to nyc-dev-plus-aospJeff Vander Stoep2016-06-012-2/+20
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "fs_mgr: pass sehandle to ext4 format routine"Treehugger Robot2016-06-012-2/+20
| |\ \ \
| | * | | fs_mgr: pass sehandle to ext4 format routineWilliam Roberts2016-05-132-2/+20
* | | | | resolve merge conflicts of e845c04 to nyc-dev-plus-aospChih-Hung Hsieh2016-05-272-5/+5
|\| | | |
| * | | | Fix misc-macro-parentheses warnings in init and other core modules.Chih-Hung Hsieh2016-05-182-5/+5
* | | | | Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611Badhri Jagan Sridharan2016-05-161-13/+48
|\| | | |
| * | | | fs_mgr: update block device reference in verity metadataJeremy Compostella2016-05-161-13/+48
| |/ / /
| * | | Merge "Add nofail fstab option"Daniel Rosenberg2016-04-144-5/+20
| |\ \ \
| | * | | Add nofail fstab optionDaniel Rosenberg2016-04-124-5/+20
| | | |/ | | |/|
* | | | Merge "If we fail to format a blank partition, try recovery" into nyc-devMatthew Bouyack2016-05-031-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | If we fail to format a blank partition, try recoveryMatthew Bouyack2016-05-031-0/+4
* | | | Merge changes from topic \'boringssl_conversion\' am: 52eb93cElliott Hughes2016-04-123-56/+47
|\ \ \ \ | | |/ / | |/| |
| * | | Switch fs_mgr and adb to libcrypto_utils.Mattias Nissler2016-04-123-56/+47
| | |/ | |/|
* | | resolve merge conflicts of 2857bd1 to nyc-devDaniel Rosenberg2016-04-124-5/+20
|\ \ \ | | |/ | |/|
| * | resolve merge conflicts of 2857bd1 to nyc-devDaniel Rosenberg2016-04-124-5/+20
| |\ \
| | * | Add nofail fstab optionDaniel Rosenberg2016-04-074-5/+20
| | * | 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
* | | | Merge "Revert "Revert "HACK: Run e2fsck with -f""" into nyc-devRobb Glasser2016-04-051-0/+1
|\| | |
| * | | Revert "Revert "HACK: Run e2fsck with -f""Robb Glasser2016-04-051-0/+1
* | | | Merge "Revert "HACK: Run e2fsck with -f"" into nyc-devPaul Lawrence2016-03-301-1/+0
|\| | |
| * | | Revert "HACK: Run e2fsck with -f"Paul Lawrence2016-03-291-1/+0
* | | | Merge "Cleanup uses of sprintf so we can deprecate it." am: 2c5b89a64aGeorge Burgess IV2016-03-082-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Cleanup uses of sprintf so we can deprecate it.George Burgess IV2016-03-072-2/+2
* | | | Merge "Distinguish between unencrypted and unencryptable" into nyc-devPaul Lawrence2016-03-072-9/+12
|\ \ \ \ | | |/ / | |/| |
| * | | Distinguish between unencrypted and unencryptablePaul Lawrence2016-03-042-9/+12
* | | | Merge "Revert "Revert "Update make_ext4fs_internal param-list to match new im...Mohamad Ayyash2016-02-231-1/+1
|\| | |
| * | | Revert "Revert "Update make_ext4fs_internal param-list to match new implement...Mohamad Ayyash2016-02-191-1/+1
* | | | Revert "Update make_ext4fs_internal param-list to match new implementation"Mohamad Ayyash2016-02-191-1/+1
|\| | |
| * | | Revert "Update make_ext4fs_internal param-list to match new implementation"Mohamad Ayyash2016-02-191-1/+1