commit 086c96ef6dd9625ccb44f6657ec91deda26039e2
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 21 11:08:07 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 21 11:08:07 2020 +0000
tree cf30390cc71529dbf700dd0acaea39f0e0c15a4d
parent e9239f757e079f3d779f3e86c12673a8c358b808
parent ef63921f81118ea71049f8ff36fa035c54ea5ecd

Merge "Bind mount install and android writable DATA and OBB dirs" into rvc-dev

fs/Ext4.cpp

diff --git a/fs/Ext4.cpp b/fs/Ext4.cpp
index 8bb930d..6bc7ad2 100644
--- a/fs/Ext4.cpp
+++ b/fs/Ext4.cpp
@@ -171,8 +171,9 @@
     cmd.push_back("-M");
     cmd.push_back(target);
 
-    bool needs_casefold = android::base::GetBoolProperty("ro.emulated_storage.casefold", false);
-    bool needs_projid = android::base::GetBoolProperty("ro.emulated_storage.projid", false);
+    bool needs_casefold =
+            android::base::GetBoolProperty("external_storage.casefold.enabled", false);
+    bool needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
 
     if (needs_projid) {
         cmd.push_back("-I");

fs/F2fs.cpp

diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index ee39f2b..9b8d2c4 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -90,8 +90,9 @@
     cmd.push_back("verity");
 
     const bool needs_casefold =
-            android::base::GetBoolProperty("ro.emulated_storage.casefold", false);
-    const bool needs_projid = android::base::GetBoolProperty("ro.emulated_storage.projid", false);
+            android::base::GetBoolProperty("external_storage.casefold.enabled", false);
+    const bool needs_projid =
+            android::base::GetBoolProperty("external_storage.projid.enabled", false);
     if (needs_projid) {
         cmd.push_back("-O");
         cmd.push_back("project_quota,extra_attr");