commit 121daf93c5931bfcd0b8be4435d2a5b770f480eb
author Bowgo Tsai <bowgotsai@google.com> Mon Jul 02 19:10:56 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 02 19:10:56 2018 -0700
tree b87a26ba9e4880dec461f0f87912fc3b405e2359
parent 0a0016ddc914978a070b4c604d4748888fa9aa37
parent 1c1186618b0ab81a02b6c01881f837569165629a

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

Change-Id: Id7c6821ea7551cfd42b4f07427d71f14a979c2aa

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 8c32587..21e132a 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -624,7 +624,8 @@
     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);
         }