From 682d37039026461161215e82b97acf5fb2846e27 Mon Sep 17 00:00:00 2001 From: Shunta Sato Date: Mon, 25 Jul 2016 13:53:26 +0900 Subject: [PATCH] DO NOT MERGE: Don't delete source file when a move opration is canceled DNM becuase Code has moved in master. Symptom: A source file is deleted even if a move operation is cancled Root cause: MoveJob doesn't check whether a move operation is canceled or not after copying file Solution: Add cancel condition check before deleting a source file Bug: 30240042 Author: Shiotani Kouji Change-Id: Ie68e5d96304a125c07d46a2fd5e4c9d84903d1e7 --- .../DocumentsUI/src/com/android/documentsui/services/MoveJob.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/MoveJob.java b/packages/DocumentsUI/src/com/android/documentsui/services/MoveJob.java index 111817132fa1..1de3bbc20496 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/services/MoveJob.java +++ b/packages/DocumentsUI/src/com/android/documentsui/services/MoveJob.java @@ -117,7 +117,9 @@ final class MoveJob extends CopyJob { byteCopyDocument(src, dest); // Remove the source document. - deleteDocument(src, srcParent); + if(!isCanceled()) { + deleteDocument(src, srcParent); + } } @Override -- 2.11.0