commit 7323ae7f90d97001db5d515320c45b2c0aced8d3
author Martijn Coenen <maco@google.com> Thu Apr 16 08:35:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 16 08:35:08 2020 +0000
tree 0568f5f4002654ee52e48b45a37b11fd4bee93ad
parent 6a4cc31ec7c9b49b9da236238356c3f23e797c34
parent 7a530e102d88896808ccabb2af202cb169e77793

Merge "Rename external storage properties." am: 014e1d7b06 am: 7a530e102d

Change-Id: I6b293a2e87b136b8c4db8abf100772c9c61e5494

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