commit 30df1c61d954273ca437e0f8a1b6fd22d6d796a8
author Sudheer Shanka <sudheersai@google.com> Fri Feb 22 17:03:02 2019 -0800
committer Sudheer Shanka <sudheersai@google.com> Fri Feb 22 17:03:02 2019 -0800
tree 09277e5a43c999a72d767125d6ff84aa5cab2117
parent 727c5fad41c4153f3dd60867b23c9637f6ac91e4

Don't delete /mnt/user/<userId>/package on reset.

We need this to stay mounted at /storage.

Bug: 124466384
Test: manual
Test: atest cts/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I0cc835471ced2822d83d7056bec53d62ddc682f0

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 0a16fc1..6e0fe21 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -898,6 +898,19 @@
 }
 
 status_t DeleteDirContentsAndDir(const std::string& pathname) {
+    status_t res = DeleteDirContents(pathname);
+    if (res < 0) {
+        return res;
+    }
+    if (rmdir(pathname.c_str()) != 0) {
+        PLOG(ERROR) << "rmdir failed on " << pathname;
+        return -errno;
+    }
+    LOG(VERBOSE) << "Success: rmdir on " << pathname;
+    return OK;
+}
+
+status_t DeleteDirContents(const std::string& pathname) {
     // Shamelessly borrowed from android::installd
     std::unique_ptr<DIR, decltype(&closedir)> dirp(opendir(pathname.c_str()), closedir);
     if (!dirp) {
@@ -907,17 +920,7 @@
         PLOG(ERROR) << "Failed to opendir " << pathname;
         return -errno;
     }
-    status_t res = delete_dir_contents(dirp.get());
-    if (res < 0) {
-        return res;
-    }
-    dirp.reset(nullptr);
-    if (rmdir(pathname.c_str()) != 0) {
-        PLOG(ERROR) << "rmdir failed on " << pathname;
-        return -errno;
-    }
-    LOG(VERBOSE) << "Success: rmdir on " << pathname;
-    return OK;
+    return delete_dir_contents(dirp.get());
 }
 
 // TODO(118708649): fix duplication with init/util.h

Utils.h

diff --git a/Utils.h b/Utils.h
index 9a1fa09..e9b1c32 100644
--- a/Utils.h
+++ b/Utils.h
@@ -140,6 +140,7 @@
 status_t UnmountTree(const std::string& mountPoint);
 
 status_t DeleteDirContentsAndDir(const std::string& pathname);
+status_t DeleteDirContents(const std::string& pathname);
 
 status_t WaitForFile(const char* filename, std::chrono::nanoseconds timeout);
 

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 83632e4..358d2eb 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -76,6 +76,7 @@
 using android::base::unique_fd;
 using android::vold::BindMount;
 using android::vold::CreateDir;
+using android::vold::DeleteDirContents;
 using android::vold::DeleteDirContentsAndDir;
 using android::vold::Symlink;
 using android::vold::Unlink;
@@ -1234,7 +1235,7 @@
     mVisibleVolumeIds.clear();
 
     for (userid_t userId : mStartedUsers) {
-        DeleteDirContentsAndDir(StringPrintf("/mnt/user/%d/package", userId));
+        DeleteDirContents(StringPrintf("/mnt/user/%d/package", userId));
     }
     mStartedUsers.clear();
     return 0;