OSDN Git Service

DO NOT MERGE: Don't delete source file when a move opration is canceled
authorShunta Sato <Shunta.Sato@sonymobile.com>
Mon, 25 Jul 2016 04:53:26 +0000 (13:53 +0900)
committerSteve McKay <smckay@google.com>
Thu, 4 Aug 2016 21:43:34 +0000 (14:43 -0700)
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 <kouji.x.shiotani@sonymobile.com>
Change-Id: Ie68e5d96304a125c07d46a2fd5e4c9d84903d1e7

packages/DocumentsUI/src/com/android/documentsui/services/MoveJob.java

index 1118171..1de3bbc 100644 (file)
@@ -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