diff options
| author | Martijn Coenen <maco@google.com> | 2020-02-14 11:44:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-14 11:44:13 +0000 |
| commit | 8b3181092275f5850d5b74ff4ef8af74662a244b (patch) | |
| tree | 4d50cfb78d8f741f7fe0d3f3a8adb7c75695503d /VolumeManager.cpp | |
| parent | 73a7a85c853368c33d0313bead59c0159adedbd1 (diff) | |
| parent | b5a31c99856875bcc48dc0958d6b83eaf2648a5a (diff) | |
| download | platform_system_vold-8b3181092275f5850d5b74ff4ef8af74662a244b.tar.gz platform_system_vold-8b3181092275f5850d5b74ff4ef8af74662a244b.tar.bz2 platform_system_vold-8b3181092275f5850d5b74ff4ef8af74662a244b.zip | |
Merge "Stop using a regex for setupAppDir."
Diffstat (limited to 'VolumeManager.cpp')
| -rw-r--r-- | VolumeManager.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/VolumeManager.cpp b/VolumeManager.cpp index bb624413..6f158461 100644 --- a/VolumeManager.cpp +++ b/VolumeManager.cpp @@ -857,18 +857,10 @@ int VolumeManager::setupAppDir(const std::string& path, int32_t appUid) { const std::string lowerPath = volume->getInternalPath() + path.substr(volume->getPath().length()); - // Do some sanity checking on the app dir (relative from root) const std::string volumeRoot = volume->getRootPath(); // eg /data/media/0 - // Make sure the Android/ directories exist and are setup correctly - int ret = PrepareAndroidDirs(volumeRoot); - if (ret != 0) { - LOG(ERROR) << "Failed to prepare Android/ directories."; - return ret; - } - - // Finally, create the app paths we need - return PrepareAppDirFromRoot(lowerPath, appUid); + // Create the app paths we need from the root + return PrepareAppDirFromRoot(lowerPath, volumeRoot, appUid); } int VolumeManager::createObb(const std::string& sourcePath, const std::string& sourceKey, |