commit 083377e593429a6db7d64de69dcc9d7209f0f66d
author Sudheer Shanka <sudheersai@google.com> Mon Feb 11 19:25:51 2019 -0800
committer Sudheer Shanka <sudheersai@google.com> Wed Feb 13 18:16:50 2019 -0800
tree 1e83422fd343cfd63e33ea061378b6db30bc8a9a
parent a6082500e405363d56234ff5198b1806850e1c86

Ensure necessary external storage dirs while creating sandboxes.

Bug: 124058579
Test: manual
Test: atest cts/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*

Change-Id: I0e62de38e9ceff80df75e253443af69d4391a49e

VolumeManager.h

diff --git a/VolumeManager.h b/VolumeManager.h
index 7d299a1..e369f68 100644
--- a/VolumeManager.h
+++ b/VolumeManager.h
@@ -152,23 +152,16 @@
 
     int prepareSandboxes(userid_t userId, const std::vector<std::string>& packageNames,
                          const std::vector<std::string>& visibleVolLabels);
+    int prepareSandboxTargets(userid_t userId, const std::vector<std::string>& packageNames,
+                              const std::vector<std::string>& visibleVolLabels);
     int mountPkgSpecificDirsForRunningProcs(userid_t userId,
                                             const std::vector<std::string>& packageNames,
                                             const std::vector<std::string>& visibleVolLabels,
                                             int remountMode);
     int destroySandboxesForVol(android::vold::VolumeBase* vol, userid_t userId);
-    std::string prepareSandboxSource(uid_t uid, const std::string& sandboxId,
-                                     const std::string& sandboxRootDir);
-    std::string prepareSandboxTarget(const std::string& packageName, uid_t uid,
-                                     const std::string& volumeLabel,
-                                     const std::string& mntTargetRootDir, bool isUserDependent);
-    std::string preparePkgDataSource(const std::string& packageName, uid_t uid,
-                                     const std::string& dataRootDir);
     std::string prepareSubDirs(const std::string& pathPrefix, const std::string& subDirs,
                                mode_t mode, uid_t uid, gid_t gid);
     bool createPkgSpecificDirRoots(const std::string& volumeRoot);
-    bool createPkgSpecificDirs(const std::string& packageName, uid_t uid,
-                               const std::string& volumeRoot, const std::string& sandboxDirRoot);
     int mountPkgSpecificDir(const std::string& mntSourceRoot, const std::string& mntTargetRoot,
                             const std::string& packageName, const char* dirName);
     int destroySandboxForAppOnVol(const std::string& packageName, const std::string& sandboxId,