From f77994d270b475f2b7d824e98228c4cfb5bda906 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Thu, 20 Mar 2014 20:21:09 -0500 Subject: Fix /data backup size if contains media subdirs /data/*/media directories are mistakenly being excluded from the size calculation. Change to absolute dir exclude so that only /data/media is excluded. Change-Id: I6e97604d44e6ea2bdf7dfd8c68a2f90ba6d44415 --- partition.cpp | 2 -- twrpDU.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/partition.cpp b/partition.cpp index 640a280ef..1ae54f57e 100644 --- a/partition.cpp +++ b/partition.cpp @@ -1822,9 +1822,7 @@ bool TWPartition::Update_Size(bool Display_Error) { if (Has_Data_Media) { if (Mount(Display_Error)) { unsigned long long data_media_used, actual_data; - du.add_relative_dir("media"); Used = du.Get_Folder_Size("/data"); - du.clear_relative_dir("media"); Backup_Size = Used; int bak = (int)(Used / 1048576LLU); int fre = (int)(Free / 1048576LLU); diff --git a/twrpDU.cpp b/twrpDU.cpp index d2345d768..28965e18b 100644 --- a/twrpDU.cpp +++ b/twrpDU.cpp @@ -38,6 +38,9 @@ twrpDU::twrpDU() { add_relative_dir(".."); add_relative_dir("lost+found"); add_absolute_dir("/data/data/com.google.android.music/files"); +#ifdef RECOVERY_SDCARD_ON_DATA + add_absolute_dir("/data/media"); +#endif parent = ""; } -- cgit v1.2.3