Merge "ADB Backup: Ignore creating backup folder for phones not decry…

…pted. This allows you to continue without error. Also we should not set restore path for images in adb backup. Change-Id: Ia75a70377b8e1364fefc82ad41ccf74fa3b7a3c3" into android-9.0

partitionmanager.cpp

@@ -907,10 +907,18 @@ int TWPartitionManager::Run_Backup(bool adbbackup) {
 	part_settings.file_bytes_remaining = part_settings.file_bytes;
 
 	gui_msg("backup_started=[BACKUP STARTED]");
-	gui_msg(Msg("backup_folder= * Backup Folder: {1}")(part_settings.Backup_Folder));
-	if (!TWFunc::Recursive_Mkdir(part_settings.Backup_Folder)) {
-		gui_err("fail_backup_folder=Failed to make backup folder.");
-		return false;
+
+	int is_decrypted = 0;
+	int is_encrypted = 0;
+
+	DataManager::GetValue(TW_IS_DECRYPTED, is_decrypted);
+	DataManager::GetValue(TW_IS_ENCRYPTED, is_encrypted);
+	if (!adbbackup || (!is_encrypted || (is_encrypted && is_decrypted))) {
+		gui_msg(Msg("backup_folder= * Backup Folder: {1}")(part_settings.Backup_Folder));
+		if (!TWFunc::Recursive_Mkdir(part_settings.Backup_Folder)) {
+			gui_err("fail_backup_folder=Failed to make backup folder.");
+			return false;
+		}
 	}
 
 	DataManager::SetProgress(0.0);

twrpAdbBuFifo.cpp

@@ -273,7 +273,6 @@ bool twrpAdbBuFifo::Restore_ADB_Backup(void) {
 					Backup_FileName = Restore_Name.substr(pos + 1, Restore_Name.size());
 					part_settings.Part = PartitionManager.Find_Partition_By_Path(path);
 					part_settings.Backup_Folder = path;
-					PartitionManager.Set_Restore_Files(path);
 					part_settings.partition_count = partition_count;
 					part_settings.adbbackup = true;
 					part_settings.adb_compression = twimghdr.compressed;