Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ad0d897 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Ignore EEXIST errors when creating pkg specific dirs. 

Some of the pkg specific dirs could be created by zygote
and vold in parallel, so ignore any EEXIST errors while
creating these dirs.

Bug: 118185801
Test: manual

Change-Id: If6c59b200dc15a8dc8750799690a9fead00d3198
parent b0d0f588

core/jni/com_android_internal_os_Zygote.cpp

+4 −3
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static void CreateSubDirs(int dirfd, const std::string& parentDirPath, 
            fail_fn(CREATE_ERROR("Failed to fstatat on %s/%s: %s",

                    parentDirPath.c_str(), dirName.c_str(), strerror(errno)));

        }

        if (TEMP_FAILURE_RETRY(mkdirat(dirfd, dirName.c_str(), 0700)) == -1) {

        if (TEMP_FAILURE_RETRY(mkdirat(dirfd, dirName.c_str(), 0700)) == -1 && errno != EEXIST) {

            fail_fn(CREATE_ERROR("Failed to mkdirat on %s/%s: %s",

                    parentDirPath.c_str(), dirName.c_str(), strerror(errno)));

        }
@@ -685,7 +685,8 @@ static void EnsurePkgSpecificDirs(const std::string& path, 
                fail_fn(CREATE_ERROR("Failed to unlink %s: %s",

                        androidDir.c_str(), strerror(errno)));

            }

            if (TEMP_FAILURE_RETRY(mkdir(androidDir.c_str(), 0700)) == -1) {

            if (TEMP_FAILURE_RETRY(mkdir(androidDir.c_str(), 0700)) == -1

                    && errno != EEXIST) {

                fail_fn(CREATE_ERROR("Failed to mkdir %s: %s",

                        androidDir.c_str(), strerror(errno)));

            }
@@ -731,7 +732,7 @@ static void CreatePkgSandboxSource(const std::string& sandboxSource, fail_fn_t f 
        fail_fn(CREATE_ERROR("Failed to stat %s: %s",

                sandboxSource.c_str(), strerror(errno)));

    }

    if (TEMP_FAILURE_RETRY(mkdir(sandboxSource.c_str(), 0700)) == -1) {

    if (TEMP_FAILURE_RETRY(mkdir(sandboxSource.c_str(), 0700)) == -1 && errno != EEXIST) {

        fail_fn(CREATE_ERROR("Failed to mkdir %s: %s",

                sandboxSource.c_str(), strerror(errno)));

    }