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

6 years ago · 112c9cc2f8
parent c5aca90465 9acc6d4398
commit 112c9cc2f8
1 changed files with 12 additions and 9 deletions
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@ -805,6 +805,8 @@ int VolumeManager::onUserStopped(userid_t userId) {
    LOG(VERBOSE) << "onUserStopped: " << userId;
    mStartedUsers.erase(userId);

+    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";
@ -815,6 +817,7 @@ int VolumeManager::onUserStopped(userid_t userId) {
            return -errno;
        }
        LOG(VERBOSE) << "Success: DeleteDirContentsAndDir on " << mntTargetDir;
+    }
    return 0;
 }