Merge "Set correct SELinux labels on new user directories" am: ff12485899 am: 855a86f6e7 am: 4792b2ff3a

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2086313

Change-Id: I5dfb47519402a0c60999d2ee16b9f3d14821da62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers 2022-05-09 17:32:43 +00:00 committed by Automerger Merge Worker
commit 844620ed8e

View file

@ -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;
}