Merge "Always unmount data and obb directory that mounted" am: ae11ab712f am: 270b1dabbc am: 61ae848c4d

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

Change-Id: Ief7e515c3e4ebe52fc9dbcfc781bbcd66c020f80
This commit is contained in:
rickywai 2021-05-06 09:11:49 +00:00 committed by Automerger Merge Worker
commit 2645038034

View file

@ -194,7 +194,9 @@ status_t EmulatedVolume::unmountFuseBindMounts() {
// Here we assume obb/data dirs is mounted as tmpfs, then it must be caused by // Here we assume obb/data dirs is mounted as tmpfs, then it must be caused by
// app data isolation. // app data isolation.
KillProcessesWithTmpfsMountPrefix(appObbDir); KillProcessesWithTmpfsMountPrefix(appObbDir);
} else { }
// Always unmount data and obb dirs as they are mounted to lowerfs for speeding up access.
std::string androidDataTarget( std::string androidDataTarget(
StringPrintf("/mnt/user/%d/%s/%d/Android/data", userId, label.c_str(), userId)); StringPrintf("/mnt/user/%d/%s/%d/Android/data", userId, label.c_str(), userId));
@ -214,7 +216,6 @@ status_t EmulatedVolume::unmountFuseBindMounts() {
return status; return status;
} }
LOG(INFO) << "Unmounted " << androidObbTarget; LOG(INFO) << "Unmounted " << androidObbTarget;
}
return OK; return OK;
} }