commit 848639bdfc67ec1ecb8d76de25b345a2a0762e2a
author Henrik Baard <henrik.baard@sonymobile.com> Thu Jul 07 01:53:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 07 01:53:29 2016 +0000
tree 7474e2d898a949608c188b5af5827e8b9c0abfa3
parent 399448345e797f54adef2476197738edc2d2d74b
parent 1bc5ab0c4dfbdd06ab4fb25621f82f76e915f5c3

Failing to \\"Migrate data\\" leaves target unusable am: 77f156d9f0
am: 1bc5ab0c4d

Change-Id: I1b93a87bb03039c627a9e057a1d1b56a2304da9e

MoveTask.cpp

diff --git a/MoveTask.cpp b/MoveTask.cpp
index f5cf04c..0a60c4e 100644
--- a/MoveTask.cpp
+++ b/MoveTask.cpp
@@ -198,7 +198,7 @@
 
     // Step 3: perform actual copy
     if (execCp(fromPath, toPath, 20, 60) != OK) {
-        goto fail;
+        goto copy_fail;
     }
 
     // NOTE: MountService watches for this magic value to know
@@ -218,6 +218,12 @@
     notifyProgress(kMoveSucceeded);
     release_wake_lock(kWakeLock);
     return;
+
+copy_fail:
+    // if we failed to copy the data we should not leave it laying around
+    // in target location. Do not check return value, we can not do any
+    // useful anyway.
+    execRm(toPath, 80, 1);
 fail:
     {
         std::lock_guard<std::mutex> lock(VolumeManager::Instance()->getLock());