commit 78c63c26a79590fa4f86ab1e5b9a6fc3fdaa9186
author Henrik Baard <henrik.baard@sonymobile.com> Thu Jul 07 01:35:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 07 01:35:41 2016 +0000
tree 34b80e0497471d959469589a128317dca87147cf
parent d254ce4ed17ec25e8e879d1026b704c72678e307
parent 7f52bca4850ca7dd1c1c3424283575c778424c97

Migrating data sometimes leaves emulated unmounted
am: 7f52bca485

Change-Id: Id45c7edab0d244dcb17d6bda491ca297ed55c1c0

MoveTask.cpp

diff --git a/MoveTask.cpp b/MoveTask.cpp
index a6e5fed..f5cf04c 100644
--- a/MoveTask.cpp
+++ b/MoveTask.cpp
@@ -182,8 +182,11 @@
 
     // Step 1: tear down volumes and mount silently without making
     // visible to userspace apps
-    bringOffline(mFrom);
-    bringOffline(mTo);
+    {
+        std::lock_guard<std::mutex> lock(VolumeManager::Instance()->getLock());
+        bringOffline(mFrom);
+        bringOffline(mTo);
+    }
 
     fromPath = mFrom->getInternalPath();
     toPath = mTo->getInternalPath();
@@ -201,8 +204,11 @@
     // NOTE: MountService watches for this magic value to know
     // that move was successful
     notifyProgress(82);
-    bringOnline(mFrom);
-    bringOnline(mTo);
+    {
+        std::lock_guard<std::mutex> lock(VolumeManager::Instance()->getLock());
+        bringOnline(mFrom);
+        bringOnline(mTo);
+    }
 
     // Step 4: clean up old data
     if (execRm(fromPath, 85, 15) != OK) {
@@ -213,8 +219,11 @@
     release_wake_lock(kWakeLock);
     return;
 fail:
-    bringOnline(mFrom);
-    bringOnline(mTo);
+    {
+        std::lock_guard<std::mutex> lock(VolumeManager::Instance()->getLock());
+        bringOnline(mFrom);
+        bringOnline(mTo);
+    }
     notifyProgress(kMoveFailedInternalError);
     release_wake_lock(kWakeLock);
     return;