diff options
author | Captain Throwback <captainthrowback@gmail.com> | 2018-07-27 16:05:24 +0200 |
---|---|---|
committer | Captain Throwback <captainthrowback@hotmail.com> | 2018-08-24 18:47:45 +0200 |
commit | 9d6feb53115e2dcc49a644400da4d62a16c1c3c6 (patch) | |
tree | c5d5778cd617d8d60231cebf87f16527a7f47313 /partitionmanager.cpp | |
parent | Merge AOSP android-9.0.0_r3 (diff) | |
download | android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.gz android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.bz2 android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.lz android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.xz android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.tar.zst android_bootable_recovery-9d6feb53115e2dcc49a644400da4d62a16c1c3c6.zip |
Diffstat (limited to 'partitionmanager.cpp')
-rw-r--r-- | partitionmanager.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/partitionmanager.cpp b/partitionmanager.cpp index 5c8a43732..da407fa69 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -1104,7 +1104,7 @@ int TWPartitionManager::Run_Restore(const string& Restore_Name) { } } TWFunc::GUI_Operation_Text(TW_UPDATE_SYSTEM_DETAILS_TEXT, gui_parse_text("{@updating_system_details}")); - UnMount_By_Path("/system", false); + UnMount_By_Path(Get_Android_Root_Path(), false); Update_System_Details(); UnMount_Main_Partitions(); time(&rStop); @@ -1490,7 +1490,7 @@ void TWPartitionManager::Update_System_Details(void) { for (iter = Partitions.begin(); iter != Partitions.end(); iter++) { (*iter)->Update_Size(true); if ((*iter)->Can_Be_Mounted) { - if ((*iter)->Mount_Point == "/system") { + if ((*iter)->Mount_Point == Get_Android_Root_Path()) { int backup_display_size = (int)((*iter)->Backup_Size / 1048576LLU); DataManager::SetValue(TW_BACKUP_SYSTEM_SIZE, backup_display_size); } else if ((*iter)->Mount_Point == "/data" || (*iter)->Mount_Point == "/datadata") { @@ -1859,7 +1859,7 @@ void TWPartitionManager::UnMount_Main_Partitions(void) { TWPartition* Boot_Partition = Find_Partition_By_Path("/boot"); - UnMount_By_Path("/system", true); + UnMount_By_Path(Get_Android_Root_Path(), true); if (!datamedia) UnMount_By_Path("/data", true); @@ -2726,6 +2726,13 @@ string TWPartitionManager::Get_Active_Slot_Display() { return Active_Slot_Display; } +string TWPartitionManager::Get_Android_Root_Path() { + std::string Android_Root = getenv("ANDROID_ROOT"); + if (Android_Root == "") + Android_Root = "/system"; + return Android_Root; +} + void TWPartitionManager::Remove_Uevent_Devices(const string& Mount_Point) { std::vector<TWPartition*>::iterator iter; |