Merge "Do not unmount /mnt/product/* when vold starts" am: 4a625453bf am: 3d4fb41f3d

am: 1c1186618b

Change-Id: Id7c6821ea7551cfd42b4f07427d71f14a979c2aa

VolumeManager.cpp

@@ -624,7 +624,8 @@ int VolumeManager::unmountAll() {
     while ((mentry = getmntent(fp)) != NULL) {
         auto test = std::string(mentry->mnt_dir);
         if ((android::base::StartsWith(test, "/mnt/") &&
-             !android::base::StartsWith(test, "/mnt/vendor")) ||
+             !android::base::StartsWith(test, "/mnt/vendor") &&
+             !android::base::StartsWith(test, "/mnt/product")) ||
             android::base::StartsWith(test, "/storage/")) {
             toUnmount.push_front(test);
         }