Merge "DO NOT MERGE: Don't delete source file when a move opration is canceled" into nyc-mr1-dev

2016-08-20 00:19:45 +00:00
parent 1b109c31bc 682d370390
commit d4f39096dd
1 changed files with 3 additions and 1 deletions
--- 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