Merge "Fix /data backup size if contains media subdirs" into android-4.4

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);

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 = "";
 }