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

Change-Id: I6b293a2e87b136b8c4db8abf100772c9c61e5494
This commit is contained in:
Martijn Coenen 2020-04-16 08:35:08 +00:00 committed by Automerger Merge Worker
commit 7323ae7f90

View file

@ -157,8 +157,8 @@ int format_volume(const std::string& volume, const std::string& directory) {
bool needs_projid = false; bool needs_projid = false;
if (volume == "/data") { if (volume == "/data") {
needs_casefold = android::base::GetBoolProperty("ro.emulated_storage.casefold", false); needs_casefold = android::base::GetBoolProperty("external_storage.casefold.enabled", false);
needs_projid = android::base::GetBoolProperty("ro.emulated_storage.projid", 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 // If there's a key_loc that looks like a path, it should be a block device for storing encryption