Tweak 5.0 L decrypt

Mount the vendor partition if it exists so we can use any
proprietary files we may need.
Relocate auto decrypt when default_password is in use to after all
partitions are added so that we can mount the vendor partition.

Change-Id: I93455a35695779f53ef57a82d3d45c7216c13639
This commit is contained in:
Ethan Yonker
2014-11-18 10:17:59 -06:00
parent 560e65f899
commit cceebb8189
3 changed files with 28 additions and 22 deletions
-15
View File
@@ -278,21 +278,6 @@ bool TWPartition::Process_Fstab_Line(string Line, bool Display_Error) {
Setup_Data_Media();
#ifdef TW_INCLUDE_CRYPTO
Can_Be_Encrypted = true;
#ifdef TW_INCLUDE_L_CRYPTO
int password_type = cryptfs_get_password_type();
if (password_type == CRYPT_TYPE_DEFAULT) {
LOGINFO("Device is encrypted with the default password, attempting to decrypt.\n");
property_set("ro.crypto.state", "encrypted");
if (cryptfs_check_passwd("default_password") == 0) {
gui_print("Successfully decrypted with default password.\n");
} else {
LOGERR("Unable to decrypt with default password.");
LOGERR("You may need to perform a Format Data.\n");
}
} else {
DataManager::SetValue("TW_CRYPTO_TYPE", password_type);
}
#endif
char crypto_blkdev[255];
property_get("ro.crypto.fs_crypto_blkdev", crypto_blkdev, "error");
if (strcmp(crypto_blkdev, "error") != 0) {