commit 5fceb48da117233715d603f4729ebd75c8727eba
author Sudheer Shanka <sudheersai@google.com> Mon Apr 29 10:46:35 2019 -0700
committer Sudheer Shanka <sudheersai@google.com> Thu May 09 17:48:04 2019 -0700
tree 7261fcca1871f008c0d44e92078bd733f69858a9
parent 676e2e0221f2dda15cbea46d927006fbd841204c

Remove storage sandboxes related code.

Bug: 131115422
Test: manual
Test: atest --test-mapping packages/providers/MediaProvider
Test: atest cts/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
Test: atest DownloadProviderTests
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest cts/tests/app/DownloadManagerLegacyTest/src/android/app/cts/DownloadManagerLegacyTest.java
Test: atest cts/tests/app/DownloadManagerApi28Test/src/android/app/cts/DownloadManagerApi28Test.java
Change-Id: Ib3272a47a901ed106474039e72f123b11f5443ff
Merged-In: Ib3272a47a901ed106474039e72f123b11f5443ff

VolumeManager.h

diff --git a/VolumeManager.h b/VolumeManager.h
index bb93b13..9bf7599 100644
--- a/VolumeManager.h
+++ b/VolumeManager.h
@@ -88,27 +88,14 @@
 
     int onUserAdded(userid_t userId, int userSerialNumber);
     int onUserRemoved(userid_t userId);
-    int onUserStarted(userid_t userId, const std::vector<std::string>& packageNames,
-                      const std::vector<int>& appIds, const std::vector<std::string>& sandboxIds);
+    int onUserStarted(userid_t userId);
     int onUserStopped(userid_t userId);
 
-    int addAppIds(const std::vector<std::string>& packageNames, const std::vector<int32_t>& appIds);
-    int addSandboxIds(const std::vector<int32_t>& appIds,
-                      const std::vector<std::string>& sandboxIds);
-    int prepareSandboxForApp(const std::string& packageName, appid_t appId,
-                             const std::string& sandboxId, userid_t userId);
-    int destroySandboxForApp(const std::string& packageName, const std::string& sandboxId,
-                             userid_t userId);
-
-    int onVolumeMounted(android::vold::VolumeBase* vol);
-    int onVolumeUnmounted(android::vold::VolumeBase* vol);
-
     int onSecureKeyguardStateChanged(bool isShowing);
 
     int setPrimary(const std::shared_ptr<android::vold::VolumeBase>& vol);
 
     int remountUid(uid_t uid, int32_t remountMode);
-    int remountUidLegacy(uid_t uid, int32_t remountMode);
 
     /* Reset all internal state, typically during framework boot */
     int reset();
@@ -150,26 +137,6 @@
 
     int linkPrimary(userid_t userId);
 
-    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>& visibleVolLabels);
-    int handleMountModeInstaller(int mountMode, int obbMountDirFd, const std::string& obbMountDir,
-                                 const std::string& sandboxId);
-    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 prepareSubDirs(const std::string& pathPrefix, const std::string& subDirs,
-                               mode_t mode, uid_t uid, gid_t gid);
-    bool createPkgSpecificDirRoots(const std::string& volumeRoot);
-    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,
-                                  userid_t userId, const std::string& volLabel);
-    int getMountModeForRunningProc(const std::vector<std::string>& packagesForUid, userid_t userId,
-                                   struct stat& mntWriteStat, struct stat& mntFullStat);
-
     void handleDiskAdded(const std::shared_ptr<android::vold::Disk>& disk);
     void handleDiskChanged(dev_t device);
     void handleDiskRemoved(dev_t device);
@@ -193,11 +160,6 @@
     std::shared_ptr<android::vold::VolumeBase> mInternalEmulated;
     std::shared_ptr<android::vold::VolumeBase> mPrimary;
 
-    std::unordered_map<std::string, appid_t> mAppIds;
-    std::unordered_map<appid_t, std::string> mSandboxIds;
-    std::unordered_map<userid_t, std::vector<std::string>> mUserPackages;
-    std::unordered_set<std::string> mVisibleVolumeIds;
-
     int mNextObbId;
     int mNextStubVolumeId;
     bool mSecureKeyguardShowing;