From 094207a4d71efaec4d10ea96e9b60da0c59f3920 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Wed, 26 Sep 2012 12:00:39 -0400 Subject: Fix problems with MTD devices Also improve handling of MTD names --- partitionmanager.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'partitionmanager.cpp') 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; -- cgit v1.2.3