Merge "Fix /data backup size if contains media subdirs" into android-4.4
diff --git a/partition.cpp b/partition.cpp
index 640a280..1ae54f5 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -1822,9 +1822,7 @@
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 3047e2b..38eb4e0 100644
--- a/twrpDU.cpp
+++ b/twrpDU.cpp
@@ -38,6 +38,9 @@
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 = "";
}