From cceebb8189788457ef3bdee408e285aa8912121a Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Tue, 18 Nov 2014 10:17:59 -0600 Subject: 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 --- partition.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'partition.cpp') diff --git a/partition.cpp b/partition.cpp index 642c3dd65..4bd545b17 100644 --- a/partition.cpp +++ b/partition.cpp @@ -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) { -- cgit v1.2.3