Merge "Fix logspam when user removed before CE storage prepared" am: 481a5367a3 am: 6f2860e3d1 am: 82a70284e8

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

Change-Id: I4b47090596f05f70b1a1118daa2db7e65816f1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers 2023-02-25 03:38:20 +00:00 committed by Automerger Merge Worker
commit ca08807617

View file

@ -114,6 +114,9 @@ static bool prepare_dir(struct selabel_handle* sehandle, mode_t mode, uid_t uid,
static bool rmrf_contents(const std::string& path) {
auto dirp = std::unique_ptr<DIR, int (*)(DIR*)>(opendir(path.c_str()), closedir);
if (!dirp) {
if (errno == ENOENT) {
return true;
}
PLOG(ERROR) << "Unable to open directory: " << path;
return false;
}