summaryrefslogtreecommitdiffstats
path: root/partition.cpp
diff options
context:
space:
mode:
authorDees_Troy <dees_troy@teamw.in>2013-04-15 16:35:47 +0200
committerDees_Troy <dees_troy@teamw.in>2013-07-01 22:20:58 +0200
commit74fb2e94d5ff09d4b5871ca33160862f72a641b6 (patch)
tree516adb61ce9145d878875b5830974b158d67b6d5 /partition.cpp
parentSupport encrypted backup files (diff)
downloadandroid_bootable_recovery-74fb2e94d5ff09d4b5871ca33160862f72a641b6.tar
android_bootable_recovery-74fb2e94d5ff09d4b5871ca33160862f72a641b6.tar.gz
android_bootable_recovery-74fb2e94d5ff09d4b5871ca33160862f72a641b6.tar.bz2
android_bootable_recovery-74fb2e94d5ff09d4b5871ca33160862f72a641b6.tar.lz
android_bootable_recovery-74fb2e94d5ff09d4b5871ca33160862f72a641b6.tar.xz
android_bootable_recovery-74fb2e94d5ff09d4b5871ca33160862f72a641b6.tar.zst
android_bootable_recovery-74fb2e94d5ff09d4b5871ca33160862f72a641b6.zip
Diffstat (limited to 'partition.cpp')
-rw-r--r--partition.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/partition.cpp b/partition.cpp
index 7b687e721..f92d62f21 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -480,7 +480,7 @@ bool TWPartition::Process_Flags(string Flags, bool Display_Error) {
Storage_Name = Display_Name;
if (!has_display_name && has_storage_name)
Display_Name = Storage_Name;
- if (has_display_name && !has_backup_name)
+ if (has_display_name && !has_backup_name && Backup_Display_Name != "Android Secure")
Backup_Display_Name = Display_Name;
if (!has_display_name && has_backup_name)
Display_Name = Backup_Display_Name;
@@ -1158,6 +1158,9 @@ bool TWPartition::Wipe_Encryption() {
return false;
Has_Data_Media = false;
+ Decrypted_Block_Device = "";
+ Is_Decrypted = false;
+ Is_Encrypted = false;
if (Wipe(Fstab_File_System)) {
Has_Data_Media = Save_Data_Media;
if (Has_Data_Media && !Symlink_Mount_Point.empty()) {