commit 1411dc024a999280b2a61a8937011e98a48c4bf3
author Inseob Kim <inseob@google.com> Fri Sep 20 08:54:18 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 20 08:54:18 2024 +0000
tree 7ecae0c8c1abceddea1478f6276dd464f944a1b4
parent 51e1ee7a4a382eac67851840d9cd3758a37f2069
parent 44f290912e01a481337b11107438889306fe41dc

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

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

Change-Id: Id03e8fe9f0b811f9d9624961e34e6fec7abedd1b
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);
         }