vold: Also wait for dm device when mounting private volume

* Fixes issue where sometimes adopted storage doesn't
  get mounted on certain devices.

Change-Id: I195bbdd4541bf1e8f373ab8ef18f5e7caefab3f5

diff --git a/model/PrivateVolume.cpp b/model/PrivateVolume.cpp
index ad3de2e..f0adb6c 100644 (file)
--- a/model/PrivateVolume.cpp
+++ b/model/PrivateVolume.cpp
@@ -99,6 +99,11 @@ status_t PrivateVolume::doDestroy() {
 }
 
 status_t PrivateVolume::doMount() {
+    if (!WaitForFile(mDmDevPath, 15s)) {
+        PLOG(ERROR) << "Timed out waiting for " << getId();
+        return -EIO;
+    }
+
     if (readMetadata()) {
         LOG(ERROR) << getId() << " failed to read metadata";
         return -EIO;