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

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

Change-Id: I975ea5b2c7c91049d7d54230977add188dcf70e0

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