commit 44f290912e01a481337b11107438889306fe41dc
author Inseob Kim <inseob@google.com> Fri Sep 20 08:35:41 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 20 08:35:41 2024 +0000
tree 7ecae0c8c1abceddea1478f6276dd464f944a1b4
parent 7c13229c4e76e4b36e1a23a27d6ea136b532e72a
parent 15fd73eab0378bd827f98c82aed7e20357e3e4f2

Merge "Do not umount /mnt/vm" into main am: 15fd73eab0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3261819

Change-Id: Ibdc167aeadb2a0f9cea2868cee2fbd91ca28293c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 7c2b2f2..a7c87a3 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -1036,7 +1036,8 @@
              !StartsWith(test, "/mnt/scratch") &&
 #endif
              !StartsWith(test, "/mnt/vendor") && !StartsWith(test, "/mnt/product") &&
-             !StartsWith(test, "/mnt/installer") && !StartsWith(test, "/mnt/androidwritable")) ||
+             !StartsWith(test, "/mnt/installer") && !StartsWith(test, "/mnt/androidwritable") &&
+             !StartsWith(test, "/mnt/vm")) ||
             StartsWith(test, "/storage/")) {
             toUnmount.push_front(test);
         }