tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Adding project_id ranges for internal app and cache folders." am: 927d9d1c68 am: acadd9bfa0

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1934961

Change-Id: I917e7fcc967ca3277caf46f7bb6a80952adc738c
This commit is contained in:
Shikha Malhotra 2022-03-10 22:45:22 +00:00 committed by Automerger Merge Worker
commit 6f1131041d
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/fs_mgr.cpp
View file

@ -364,8 +364,8 @@ static void tune_quota(const std::string& blk_device, const FstabEntry& entry,
const struct ext4_super_block* sb, int* fs_stat) {
bool has_quota = (sb->s_feature_ro_compat & cpu_to_le32(EXT4_FEATURE_RO_COMPAT_QUOTA)) != 0;
bool want_quota = entry.fs_mgr_flags.quota;
bool want_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
// Enable projid support by default
bool want_projid = true;
if (has_quota == want_quota) {
return;
}

3
fs_mgr/fs_mgr_format.cpp
View file

@ -156,11 +156,10 @@ int fs_mgr_do_format(const FstabEntry& entry) {
LERROR << __FUNCTION__ << ": Format " << entry.blk_device << " as '" << entry.fs_type << "'";
bool needs_casefold = false;
bool needs_projid = false;
bool needs_projid = true;
if (entry.mount_point == "/data") {
needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false);
needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
}
if (entry.fs_type == "f2fs") {

10
libcutils/include/private/android_projectid_config.h
View file

@ -49,3 +49,13 @@
#define PROJECT_ID_EXT_OBB_START 40000
/* End of project IDs for apps to mark external OBB data. */
#define PROJECT_ID_EXT_OBB_END 49999
/* Start of project IDs for apps to mark internal app data. */
#define PROJECT_ID_APP_START 50000
/* End of project IDs for apps to mark internal app data. */
#define PROJECT_ID_APP_END 59999
/* Start of project IDs for apps to mark internal app cache data. */
#define PROJECT_ID_APP_CACHE_START 60000
/* End of project IDs for apps to mark internal app cache data. */
#define PROJECT_ID_APP_CACHE_END 69999