summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShikha Malhotra <shikhamalhotra@google.com>2022-03-22 17:05:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-22 17:05:45 +0000
commitb53bfcabd93420120348a65915cabe624c4e720e (patch)
treea4db4a3448d2e61640041d0344dbb87f20413ab0
parent656d836566b47367431dff18ec915875e406e27d (diff)
parente2d020d12f17233436b1bc61e48cc846efc6dacd (diff)
downloadvold-b53bfcabd93420120348a65915cabe624c4e720e.tar.gz
Merge "Enable ProjectID for the file systems by default." am: 8acf8298f9 am: 2727ad7d1a am: e2d020d12f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1967545 Change-Id: I6ec564f62fd1fbc777aa59f7af4a5b71adf76a0c
-rw-r--r--fs/Ext4.cpp2
-rw-r--r--fs/F2fs.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/Ext4.cpp b/fs/Ext4.cpp
index 77cec803..52f6772b 100644
--- a/fs/Ext4.cpp
+++ b/fs/Ext4.cpp
@@ -171,7 +171,7 @@ status_t Format(const std::string& source, unsigned long numSectors, const std::
bool needs_casefold =
android::base::GetBoolProperty("external_storage.casefold.enabled", false);
- bool needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
+ bool needs_projid = true;
if (needs_projid) {
cmd.push_back("-I");
diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index f4a81ee0..5012b280 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -97,8 +97,7 @@ status_t Format(const std::string& source) {
const bool needs_casefold =
android::base::GetBoolProperty("external_storage.casefold.enabled", false);
- const bool needs_projid =
- android::base::GetBoolProperty("external_storage.projid.enabled", false);
+ const bool needs_projid = true;
if (needs_projid) {
cmd.emplace_back("-O");
cmd.emplace_back("project_quota,extra_attr");