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

Commit ca74c56e authored by rickywai's avatar rickywai Committed by Automerger Merge Worker
Browse files

Merge "Check the data directory before mount tmpfs" am: 767c2ba7 am: fc0e10b2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771085

Change-Id: I75ec659199b4b892c60b44aa8ba36f68fc1b74e4
parents 0510b505 fc0e10b2

core/jni/com_android_internal_os_Zygote.cpp

+6 −0
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ static constexpr unsigned int STORAGE_DIR_CHECK_MAX_INTERVAL_US = 1000; 
 */

static constexpr int STORAGE_DIR_CHECK_TIMEOUT_US = 1000 * 1000 * 60 * 5;



static void WaitUntilDirReady(const std::string& target, fail_fn_t fail_fn);



/**

 * A helper class containing accounting information for USAPs.

 */
@@ -1249,7 +1251,11 @@ static void isolateAppData(JNIEnv* env, const std::vector<std::string>& merged_d 
    auto volPath = StringPrintf("%s/%s", externalPrivateMountPath, ent->d_name);

    auto cePath = StringPrintf("%s/user", volPath.c_str());

    auto dePath = StringPrintf("%s/user_de", volPath.c_str());

    // Wait until dir user is created.

    WaitUntilDirReady(cePath.c_str(), fail_fn);

    MountAppDataTmpFs(cePath.c_str(), fail_fn);

    // Wait until dir user_de is created.

    WaitUntilDirReady(dePath.c_str(), fail_fn);

    MountAppDataTmpFs(dePath.c_str(), fail_fn);

  }

  closedir(dir);