summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-12 18:53:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-05-12 18:53:03 +0000
commit361959edf01cc573fec97931d07358243cc40ef9 (patch)
treee41f46b3a74df6142b0c6f8ab07d612e0ff7b2dc
parentdf6af77830f9598c26298d21900e140043d5544f (diff)
parent06f69a2631b426ae1c00d334facd61f539ef1e20 (diff)
downloadvold-main-cg-testing-release.tar.gz
Merge "Snap for 8580505 from ff12485899dbcf058cd529fed12b0bf4cb752285 to main-cg-testing-release" into main-cg-testing-releasemain-cg-testing-release
-rw-r--r--FsCrypt.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index 6c081778..3c825eaf 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -309,7 +309,7 @@ static bool read_and_install_user_ce_key(userid_t user_id,
static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gid) {
LOG(DEBUG) << "Preparing: " << dir;
- if (fs_prepare_dir(dir.c_str(), mode, uid, gid) != 0) {
+ if (android::vold::PrepareDir(dir, mode, uid, gid, 0) != 0) {
PLOG(ERROR) << "Failed to prepare " << dir;
return false;
}