commit 4a625453bfa6f42997d90be20e0499bdbe82bbaa
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 03 00:21:01 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 03 00:21:01 2018 +0000
tree ba8555d4ff19ee947085aba0cef361a2e0b91773
parent 4a634e3d8c0c1425736978d044e3c69c7429c75d
parent c0cd37be9dd66d5fe7448389a71ee21f60e876e1

Merge "Do not unmount /mnt/product/* when vold starts"

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 98f12e8..1a8c79d 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -754,7 +754,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);
         }