summaryrefslogtreecommitdiffstats
path: root/partitionmanager.cpp
diff options
context:
space:
mode:
authorDees_Troy <dees_troy@teamw.in>2012-09-26 18:00:39 +0200
committerDees_Troy <dees_troy@teamw.in>2012-09-26 18:01:13 +0200
commit094207a4d71efaec4d10ea96e9b60da0c59f3920 (patch)
treee5100447ede760751acec56274ae1eac78a855ad /partitionmanager.cpp
parentUpdate version and readme (diff)
downloadandroid_bootable_recovery-094207a4d71efaec4d10ea96e9b60da0c59f3920.tar
android_bootable_recovery-094207a4d71efaec4d10ea96e9b60da0c59f3920.tar.gz
android_bootable_recovery-094207a4d71efaec4d10ea96e9b60da0c59f3920.tar.bz2
android_bootable_recovery-094207a4d71efaec4d10ea96e9b60da0c59f3920.tar.lz
android_bootable_recovery-094207a4d71efaec4d10ea96e9b60da0c59f3920.tar.xz
android_bootable_recovery-094207a4d71efaec4d10ea96e9b60da0c59f3920.tar.zst
android_bootable_recovery-094207a4d71efaec4d10ea96e9b60da0c59f3920.zip
Diffstat (limited to 'partitionmanager.cpp')
-rw-r--r--partitionmanager.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index df67bb52c..034b5cdf7 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -178,8 +178,6 @@ void TWPartitionManager::Output_Partition(TWPartition* Part) {
printf(" Backup_Name: %s\n", Part->Backup_Name.c_str());
if (!Part->Backup_FileName.empty())
printf(" Backup_FileName: %s\n", Part->Backup_FileName.c_str());
- if (!Part->MTD_Name.empty())
- printf(" MTD_Name: %s\n", Part->MTD_Name.c_str());
if (!Part->Storage_Path.empty())
printf(" Storage_Path: %s\n", Part->Storage_Path.c_str());
if (!Part->Current_File_System.empty())
@@ -191,6 +189,8 @@ void TWPartitionManager::Output_Partition(TWPartition* Part) {
} else {
printf("%s | %s | Size: %iMB\n", Part->Mount_Point.c_str(), Part->Actual_Block_Device.c_str(), (int)(Part->Size / mb));
}
+ if (!Part->MTD_Name.empty())
+ printf(" MTD_Name: %s\n", Part->MTD_Name.c_str());
string back_meth = Part->Backup_Method_By_Name();
printf(" Backup_Method: %s\n\n", back_meth.c_str());
}
@@ -1219,6 +1219,9 @@ int TWPartitionManager::Factory_Reset(void) {
if ((*iter)->Wipe_During_Factory_Reset && (*iter)->Is_Present) {
if (!(*iter)->Wipe())
ret = false;
+ } else if ((*iter)->Has_Android_Secure) {
+ if (!(*iter)->Wipe_AndSec())
+ ret = false;
}
}
return ret;