commit 83378991031c935f6a3581567beb5fb9d124419e
author Tri Vo <trong@google.com> Tue Apr 17 13:42:34 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 17 13:42:34 2018 -0700
tree 4a404f8caa96295846ec329a8d1683f477e5b550
parent 4e3a51ff1844d646cb761ed147ee252174c4e89b
parent b244714eeae9521c59804b4e90aff425baf9777f

Merge "Exclude /mnt/vendor from vold's ownership." into pi-dev
am: b244714eea

Change-Id: Iefcaf167fe242f90ac715905f15dc88de0b154c8

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);
         }
     }