commit c98d1f5883ccc0eb7e424b95556fc13af15d2dfe
author Elliott Hughes <enh@google.com> Sat Apr 25 17:24:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Apr 25 17:24:04 2015 +0000
tree a0e8b44a301aecf7fa2dcb1a39116a198d68aaba
parent 1d6fbcc389ecb9f418076e8ab5f4c93a5d911de9
parent 85c7c08e2511509a306c3a5b202ceda922f5f2b5

am 85c7c08e: am d5aa67cc: Merge "Wait for completion of device mapping in mountObb"

* commit '85c7c08e2511509a306c3a5b202ceda922f5f2b5':
  Wait for completion of device mapping in mountObb

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
old mode 100644
new mode 100755
index cd1017c..5c4f9af
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -1584,6 +1584,11 @@
         }
     }
 
+    /*
+     * Wait for the device mapper node to be created.
+     */
+    waitForDevMapper(dmDevice);
+
     if (Fat::doMount(dmDevice, mountPoint, true, false, true, 0, ownerGid,
                      0227, false)) {
         SLOGE("Image mount failed (%s)", strerror(errno));