diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2014-02-06 20:05:30 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit> | 2014-02-06 20:05:30 +0100 |
| commit | a21b0525891068f9df1178e37615753da809bfe2 (patch) | |
| tree | 3beaebfda4d01232f0aa175c2a2161ea74fc023a | |
| parent | Disable alpha blending for fully opaque rectangles (diff) | |
| parent | Improve android secure handling (diff) | |
| download | android_bootable_recovery-a21b0525891068f9df1178e37615753da809bfe2.tar android_bootable_recovery-a21b0525891068f9df1178e37615753da809bfe2.tar.gz android_bootable_recovery-a21b0525891068f9df1178e37615753da809bfe2.tar.bz2 android_bootable_recovery-a21b0525891068f9df1178e37615753da809bfe2.tar.lz android_bootable_recovery-a21b0525891068f9df1178e37615753da809bfe2.tar.xz android_bootable_recovery-a21b0525891068f9df1178e37615753da809bfe2.tar.zst android_bootable_recovery-a21b0525891068f9df1178e37615753da809bfe2.zip | |
| -rw-r--r-- | partition.cpp | 13 | ||||
| -rw-r--r-- | partitionmanager.cpp | 3 |
2 files changed, 4 insertions, 12 deletions
diff --git a/partition.cpp b/partition.cpp index b79e774cb..95f6bcac4 100644 --- a/partition.cpp +++ b/partition.cpp @@ -361,10 +361,6 @@ bool TWPartition::Process_Fstab_Line(string Line, bool Display_Error) { Is_Storage = true; Removable = true; Wipe_Available_in_GUI = true; -#ifndef RECOVERY_SDCARD_ON_DATA - Setup_AndSec(); - Mount_Storage_Retry(); -#endif #endif } #ifdef TW_INTERNAL_STORAGE_PATH @@ -373,20 +369,12 @@ bool TWPartition::Process_Fstab_Line(string Line, bool Display_Error) { Is_Settings_Storage = true; Storage_Path = EXPAND(TW_INTERNAL_STORAGE_PATH); Wipe_Available_in_GUI = true; -#ifndef RECOVERY_SDCARD_ON_DATA - Setup_AndSec(); - Mount_Storage_Retry(); -#endif } #else if (Mount_Point == "/emmc" || Mount_Point == "/internal_sd" || Mount_Point == "/internal_sdcard") { Is_Storage = true; Is_Settings_Storage = true; Wipe_Available_in_GUI = true; -#ifndef RECOVERY_SDCARD_ON_DATA - Setup_AndSec(); - Mount_Storage_Retry(); -#endif } #endif } else if (Is_Image(Fstab_File_System)) { @@ -663,6 +651,7 @@ void TWPartition::Setup_AndSec(void) { Backup_Path = Symlink_Mount_Point; Make_Dir("/and-sec", true); Recreate_AndSec_Folder(); + Mount_Storage_Retry(); } void TWPartition::Find_Real_Block_Device(string& Block, bool Display_Error) { diff --git a/partitionmanager.cpp b/partitionmanager.cpp index 091ae3288..04dbee967 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -96,6 +96,9 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error) for (iter = Partitions.begin(); iter != Partitions.end(); iter++) { if ((*iter)->Is_Storage) { (*iter)->Is_Settings_Storage = true; +#ifndef RECOVERY_SDCARD_ON_DATA + (*iter)->Setup_AndSec(); +#endif Found_Settings_Storage = true; DataManager::SetValue("tw_settings_path", (*iter)->Storage_Path); DataManager::SetValue("tw_storage_path", (*iter)->Storage_Path); |