summaryrefslogtreecommitdiffstats
path: root/partitionmanager.cpp
diff options
context:
space:
mode:
authorDees_Troy <dees_troy@teamw.in>2013-01-10 15:14:10 +0100
committerDees_Troy <dees_troy@teamw.in>2013-01-10 15:15:01 +0100
commit20c02c09539d0f8d803c3cc58b145fd146a510c3 (patch)
tree8fd94533088f3108b5778ef9b6009ecfd43b4458 /partitionmanager.cpp
parentFix wiping problems and save ecrypt key (diff)
downloadandroid_bootable_recovery-20c02c09539d0f8d803c3cc58b145fd146a510c3.tar
android_bootable_recovery-20c02c09539d0f8d803c3cc58b145fd146a510c3.tar.gz
android_bootable_recovery-20c02c09539d0f8d803c3cc58b145fd146a510c3.tar.bz2
android_bootable_recovery-20c02c09539d0f8d803c3cc58b145fd146a510c3.tar.lz
android_bootable_recovery-20c02c09539d0f8d803c3cc58b145fd146a510c3.tar.xz
android_bootable_recovery-20c02c09539d0f8d803c3cc58b145fd146a510c3.tar.zst
android_bootable_recovery-20c02c09539d0f8d803c3cc58b145fd146a510c3.zip
Diffstat (limited to 'partitionmanager.cpp')
-rw-r--r--partitionmanager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 5d75d3212..ab73a1110 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -1595,6 +1595,7 @@ int TWPartitionManager::Decrypt_Device(string Password) {
else
efs = 0;
#ifdef TW_EXTERNAL_STORAGE_PATH
+#ifdef TW_INCLUDE_CRYPTO_SAMSUNG
TWPartition* sdcard = Find_Partition_By_Path(EXPAND(TW_EXTERNAL_STORAGE_PATH));
if (sdcard && sdcard->Mount(false)) {
property_set("ro.crypto.external_encrypted", "1");
@@ -1603,6 +1604,7 @@ int TWPartitionManager::Decrypt_Device(string Password) {
property_set("ro.crypto.external_encrypted", "0");
}
#endif
+#endif
strcpy(cPassword, Password.c_str());
int pwret = cryptfs_check_passwd(cPassword);
@@ -1641,6 +1643,7 @@ int TWPartitionManager::Decrypt_Device(string Password) {
}
#endif //ifdef CRYPTO_SD_FS_TYPE
#ifdef TW_EXTERNAL_STORAGE_PATH
+#ifdef TW_INCLUDE_CRYPTO_SAMSUNG
char is_external_decrypted[255];
property_get("ro.crypto.external_use_ecryptfs", is_external_decrypted, "0");
if (strcmp(is_external_decrypted, "1") == 0) {
@@ -1651,6 +1654,7 @@ int TWPartitionManager::Decrypt_Device(string Password) {
sdcard->Is_Decrypted = false;
sdcard->Decrypted_Block_Device = "";
}
+#endif
#endif //ifdef TW_EXTERNAL_STORAGE_PATH
// Sleep for a bit so that the device will be ready