commit 1ffa40c3f577be7022fe42b641031b51f3e7c6ce
author Martijn Coenen <maco@google.com> Thu Apr 16 09:48:27 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 16 09:48:27 2020 +0000
tree 0fb1fc039d91e55eaa868c43cedee3e0cdbfaee7
parent ae2450e340685fac4612249658e8438c6f20535d
parent 301d51ceb6e85050be15dcbce15b2c2c3b1cfe0a

Merge "Rename external storage properties." am: 014e1d7b06 am: 7a530e102d am: 7323ae7f90 am: bfb67c0dd7 am: 1e5918cd75 am: 301d51ceb6

Change-Id: I546a2d8c351293b7f07505bea1df77ac84f4475e

recovery_utils/roots.cpp

diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp
index ae656d0..1948447 100644
--- a/recovery_utils/roots.cpp
+++ b/recovery_utils/roots.cpp
@@ -157,8 +157,8 @@
   bool needs_projid = false;
 
   if (volume == "/data") {
-    needs_casefold = android::base::GetBoolProperty("ro.emulated_storage.casefold", false);
-    needs_projid = android::base::GetBoolProperty("ro.emulated_storage.projid", false);
+    needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false);
+    needs_projid = android::base::GetBoolProperty("external_storage.projid.enabled", false);
   }
 
   // If there's a key_loc that looks like a path, it should be a block device for storing encryption