tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow fscrypt_mount_metadata_encrypted to be called more than once"

Browse source
This commit is contained in:
Nikita Ioffe 2019-12-11 18:40:21 +00:00 committed by Gerrit Code Review
commit 69199c70ec
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MetadataCrypt.cpp
View file

@ -189,7 +189,7 @@ bool fscrypt_mount_metadata_encrypted(const std::string& blk_device, const std::
bool needs_encrypt) {
LOG(DEBUG) << "fscrypt_mount_metadata_encrypted: " << mount_point << " " << needs_encrypt;
auto encrypted_state = android::base::GetProperty("ro.crypto.state", "");
if (encrypted_state != "") {
if (encrypted_state != "" && encrypted_state != "encrypted") {
LOG(DEBUG) << "fscrypt_enable_crypto got unexpected starting state: " << encrypted_state;
return false;
}