| commit | 82a70284e8341dcc4b4f3a4b89fcc94332105f6a | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Sat Feb 25 02:41:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 25 02:41:48 2023 +0000 |
| tree | 691713cbd507724ae9bda18aecd0eaf8cd2c0c54 | |
| parent | e182824b3ba6e67ea6c1673b88e6ea8d20a3fd45 [diff] | |
| parent | 6f2860e3d1a689eb5fb9d9ce0ea69547b2753207 [diff] |
Merge "Fix logspam when user removed before CE storage prepared" am: 481a5367a3 am: 6f2860e3d1 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2456268 Change-Id: I6893e48e0a0e4435c2ad24273111622476d281fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp index 94d7f15..6ad3c6f 100644 --- a/vold_prepare_subdirs.cpp +++ b/vold_prepare_subdirs.cpp
@@ -114,6 +114,9 @@ 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; }