tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Check isolated_storage is enabled before cleaning up sandboxes."

Browse source
This commit is contained in:
Sudheer Shanka 2018-10-09 19:07:40 +00:00 committed by Android (Google) Code Review
commit 112c9cc2f8
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
VolumeManager.cpp
View file

@ -805,16 +805,19 @@ int VolumeManager::onUserStopped(userid_t userId) {
LOG(VERBOSE) << "onUserStopped: " << userId;
mStartedUsers.erase(userId);
std::string mntTargetDir = StringPrintf("/mnt/user/%d", userId);
if (android::vold::UnmountTree(mntTargetDir) != 0) {
PLOG(ERROR) << "unmountTree on " << mntTargetDir << " failed";
return -errno;
if (GetBoolProperty(kIsolatedStorage, false)) {
mUserPackages.erase(userId);
std::string mntTargetDir = StringPrintf("/mnt/user/%d", userId);
if (android::vold::UnmountTree(mntTargetDir) != 0) {
PLOG(ERROR) << "unmountTree on " << mntTargetDir << " failed";
return -errno;
}
if (android::vold::DeleteDirContentsAndDir(mntTargetDir) < 0) {
PLOG(ERROR) << "DeleteDirContentsAndDir failed on " << mntTargetDir;
return -errno;
}
LOG(VERBOSE) << "Success: DeleteDirContentsAndDir on " << mntTargetDir;
}
if (android::vold::DeleteDirContentsAndDir(mntTargetDir) < 0) {
PLOG(ERROR) << "DeleteDirContentsAndDir failed on " << mntTargetDir;
return -errno;
}
LOG(VERBOSE) << "Success: DeleteDirContentsAndDir on " << mntTargetDir;
return 0;
}