commit 4a04cad4ec65dc9e069809e1756242e63ab18ff5
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 20 23:42:04 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 20 23:42:04 2018 +0000
tree 5d9c7f23d0a8e8f7d0cdda4595ae7671832e0397
parent b244714eeae9521c59804b4e90aff425baf9777f
parent eefc5eebc3f89d9a5e41cf51a7da2b972ff1abe7

Merge "vold: Idle-maint calls device GC" into pi-dev

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 5e6e74f..8c32587 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -623,8 +623,9 @@
     mntent* mentry;
     while ((mentry = getmntent(fp)) != NULL) {
         auto test = std::string(mentry->mnt_dir);
-        if (android::base::StartsWith(test, "/mnt/")
-                || android::base::StartsWith(test, "/storage/")) {
+        if ((android::base::StartsWith(test, "/mnt/") &&
+             !android::base::StartsWith(test, "/mnt/vendor")) ||
+            android::base::StartsWith(test, "/storage/")) {
             toUnmount.push_front(test);
         }
     }