Merge "Isolate profile ref data" into sc-dev (cb5ed8fe) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_os_Zygote.cpp

+12 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}