Snap for 4728508 from b244714eea to pi-release

Change-Id: Ic923ff3934623757175b584211e25d5c1985ee43
6 years ago · 58c5b47163
parent ce0e340b52 b244714eea
commit 58c5b47163
1 changed files with 3 additions and 2 deletions
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@ -623,8 +623,9 @@ int VolumeManager::unmountAll() {
    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);
        }
    }