Clear cached files on external storage.
When clearing cached files belonging to an app, include any cached
files on external storage. Since we need to keep sdcardfs in the
loop about any file deletions, we always mutate by going through the
sdcardfs layer instead of behind its back.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37486230, 37566983, 37913442, 37914374
Change-Id: If174bf7eaf682da83cf0ab1b4938fe9a5956d464
diff --git a/cmds/installd/InstalldNativeService.h b/cmds/installd/InstalldNativeService.h
index 7f73c2a..200fc77 100644
--- a/cmds/installd/InstalldNativeService.h
+++ b/cmds/installd/InstalldNativeService.h
@@ -121,14 +121,18 @@
private:
std::recursive_mutex mLock;
- std::recursive_mutex mQuotaDevicesLock;
- std::recursive_mutex mCacheQuotasLock;
+ std::recursive_mutex mMountsLock;
+ std::recursive_mutex mQuotasLock;
- /* Map from mount point to underlying device node */
- std::unordered_map<std::string, std::string> mQuotaDevices;
+ /* Map of all storage mounts from source to target */
+ std::unordered_map<std::string, std::string> mStorageMounts;
+ /* Map of all quota mounts from target to source */
+ std::unordered_map<std::string, std::string> mQuotaReverseMounts;
+
/* Map from UID to cache quota size */
std::unordered_map<uid_t, int64_t> mCacheQuotas;
+ std::string findDataMediaPath(const std::unique_ptr<std::string>& uuid, userid_t userid);
std::string findQuotaDeviceForUuid(const std::unique_ptr<std::string>& uuid);
};