Paul Lawrence 0a423d994a DO NOT MERGE Securely encrypt the master key ... (chery-picked from commit 806d10be23) Move all key management into vold Reuse vold's existing key management through the crypto footer to manage the device wide keys. Use ro.crypto.type flag to determine crypto type, which prevents any issues when running in block encrypted mode, as well as speeding up boot in block or no encryption. This is one of four changes to enable this functionality: https://android-review.googlesource.com/#/c/148586/ https://android-review.googlesource.com/#/c/148604/ https://android-review.googlesource.com/#/c/148606/ https://android-review.googlesource.com/#/c/148607/ Bug: 18151196 Change-Id: I6a8a18f43ae837e330e2785bd26c2c306ae1816b		2015-05-29 17:39:16 +00:00
..
include	resolved conflicts for merge of d0b6de41 to master	2015-04-13 18:01:33 -07:00
Android.mk	resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp	2015-04-13 16:29:05 -07:00
fs_mgr.c	DO NOT MERGE Securely encrypt the master key	2015-05-29 17:39:16 +00:00
fs_mgr_format.c	resolved conflicts for merge of d0b6de41 to master	2015-04-13 18:01:33 -07:00
fs_mgr_fstab.c	am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage of total memory" into lmp-mr1-dev	2015-05-13 17:07:53 +00:00
fs_mgr_main.c	Cleanup: warning fixit.	2014-04-11 16:15:46 -07:00
fs_mgr_priv.h	resolved conflicts for merge of d0b6de41 to master	2015-04-13 18:01:33 -07:00
fs_mgr_priv_verity.h	Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""	2014-12-09 17:02:17 -08:00
fs_mgr_verity.c	Don't use TEMP_FAILURE_RETRY on close in system/core.	2015-05-27 13:27:06 -07:00