Add fixupAppDir() API.
This can be used to fixup application directories in case they have been
created by some other entity besides vold; the main use case for this
API right now is OBB directories, which can be created by installers
outside of vold; on devices without sdcardfs, such directories and the
files contained therein are not setup correctly. This API will make sure
everything is setup the way it needs to be setup.
Bug: 146419093
Test: inspect OBB dir after install
Change-Id: I2e35b7ac2992dbb21cc950e53651ffc07cfca907
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 6f15846..f7b36bf 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -814,7 +814,7 @@
return 0;
}
-int VolumeManager::setupAppDir(const std::string& path, int32_t appUid) {
+int VolumeManager::setupAppDir(const std::string& path, int32_t appUid, bool fixupExistingOnly) {
// Only offer to create directories for paths managed by vold
if (!StartsWith(path, "/storage/")) {
LOG(ERROR) << "Failed to find mounted volume for " << path;
@@ -859,8 +859,21 @@
const std::string volumeRoot = volume->getRootPath(); // eg /data/media/0
+ if (fixupExistingOnly && (access(lowerPath.c_str(), F_OK) != 0)) {
+ // Nothing to fixup
+ return OK;
+ }
+
// Create the app paths we need from the root
- return PrepareAppDirFromRoot(lowerPath, volumeRoot, appUid);
+ return PrepareAppDirFromRoot(lowerPath, volumeRoot, appUid, fixupExistingOnly);
+}
+
+int VolumeManager::fixupAppDir(const std::string& path, int32_t appUid) {
+ if (IsFilesystemSupported("sdcardfs")) {
+ //sdcardfs magically does this for us
+ return OK;
+ }
+ return setupAppDir(path, appUid, true /* fixupExistingOnly */);
}
int VolumeManager::createObb(const std::string& sourcePath, const std::string& sourceKey,