commit e2d020d12f17233436b1bc61e48cc846efc6dacd
author Shikha Malhotra <shikhamalhotra@google.com> Tue Mar 22 17:04:53 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 22 17:04:53 2022 +0000
tree a4db4a3448d2e61640041d0344dbb87f20413ab0
parent 15a316dbd20a3af85e32d73953ff4e96cdae083e
parent 2727ad7d1aa49a63c8b932b7fad3b3608681c478

Merge "Enable ProjectID for the file systems by default." am: 8acf8298f9 am: 2727ad7d1a

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1967545

Change-Id: I3c6c22f3b074131caf0e174230727f18548a2778

fs/Ext4.cpp

diff --git a/fs/Ext4.cpp b/fs/Ext4.cpp
index 77cec80..52f6772 100644
--- a/fs/Ext4.cpp
+++ b/fs/Ext4.cpp
@@ -171,7 +171,7 @@
 
     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");

fs/F2fs.cpp

diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index f4a81ee..5012b28 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -97,8 +97,7 @@
 
     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");