Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Isolate profile ref data" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-29 15:27:39 +00:00
committed by Android (Google) Code Review
parent f835903651 6ff4f2a307
commit cb5ed8fef9
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -170,6 +170,7 @@ static constexpr const uint64_t UPPER_HALF_WORD_MASK = 0xFFFF'FFFF'0000'0000;
static constexpr const uint64_t LOWER_HALF_WORD_MASK = 0x0000'0000'FFFF'FFFF;
static constexpr const char* kCurProfileDirPath = "/data/misc/profiles/cur";
static constexpr const char* kRefProfileDirPath = "/data/misc/profiles/ref";
/**
* The maximum value that the gUSAPPoolSizeMax variable may take. This value
@@ -1433,6 +1434,7 @@ static void isolateJitProfile(JNIEnv* env, jobjectArray pkg_data_info_list,
// Mount (namespace) tmpfs on profile directory, so apps no longer access
// the original profile directory anymore.
MountAppDataTmpFs(kCurProfileDirPath, fail_fn);
MountAppDataTmpFs(kRefProfileDirPath, fail_fn);
// Create profile directory for this user.
std::string actualCurUserProfile = StringPrintf("%s/%d", kCurProfileDirPath, user_id);
@@ -1446,14 +1448,24 @@ static void isolateJitProfile(JNIEnv* env, jobjectArray pkg_data_info_list,
packageName.c_str());
std::string mirrorCurPackageProfile = StringPrintf("/data_mirror/cur_profiles/%d/%s",
user_id, packageName.c_str());
std::string actualRefPackageProfile = StringPrintf("%s/%s", kRefProfileDirPath,
packageName.c_str());
std::string mirrorRefPackageProfile = StringPrintf("/data_mirror/ref_profiles/%s",
packageName.c_str());
if (access(mirrorCurPackageProfile.c_str(), F_OK) != 0) {
ALOGW("Can't access app profile directory: %s", mirrorCurPackageProfile.c_str());
continue;
}
if (access(mirrorRefPackageProfile.c_str(), F_OK) != 0) {
ALOGW("Can't access app profile directory: %s", mirrorRefPackageProfile.c_str());
continue;
}
PrepareDir(actualCurPackageProfile, DEFAULT_DATA_DIR_PERMISSION, uid, uid, fail_fn);
BindMount(mirrorCurPackageProfile, actualCurPackageProfile, fail_fn);
PrepareDir(actualRefPackageProfile, DEFAULT_DATA_DIR_PERMISSION, uid, uid, fail_fn);
BindMount(mirrorRefPackageProfile, actualRefPackageProfile, fail_fn);
}
}