commit e326e59ddea18cdd18c5cd8ee5faef9fae636cc6
author Martijn Coenen <maco@google.com> Fri Apr 17 08:10:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 17 08:10:37 2020 +0000
tree b97a0d4f7fc1f8362c44393add7a7a8defd8c441
parent 500ed46d9effc1f5269cf7672f3f60f85195c418
parent 94abf26ba2ae26a37b44a4de4cc949bbf26f762e

Rename external storage properties. am: 94abf26ba2

Change-Id: Ica2afbfb20fe801a7175cf8866245581c9ade878

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