commit 3b35589c885719ab8cb1d5ceb81b1c879231779d
author Martijn Coenen <maco@google.com> Fri Apr 17 08:44:29 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 17 08:44:29 2020 +0000
tree 5e6753c588027efd6c6c978bdb68b7f111371e11
parent 3143f8e5806769011a45aee2d21c54aeaffb79df
parent 9f1c606aeed697ba3ab21910ffc4870c84ff0792

Rename external storage properties. am: 94abf26ba2 am: e326e59dde am: 9f1c606aee

Change-Id: I833c6d2d8403f19032da6a7bab5773c13486205a

recovery_utils/roots.cpp

diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp
index 58a3139..99f3c5d 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