Merge "Do not unmount /mnt/product/* when vold starts"

This commit is contained in:
Treehugger Robot 2018-07-03 00:21:01 +00:00 committed by Gerrit Code Review
commit 4a625453bf

View file

@ -754,7 +754,8 @@ int VolumeManager::unmountAll() {
while ((mentry = getmntent(fp)) != NULL) {
auto test = std::string(mentry->mnt_dir);
if ((android::base::StartsWith(test, "/mnt/") &&
!android::base::StartsWith(test, "/mnt/vendor")) ||
!android::base::StartsWith(test, "/mnt/vendor") &&
!android::base::StartsWith(test, "/mnt/product")) ||
android::base::StartsWith(test, "/storage/")) {
toUnmount.push_front(test);
}