Merge "Allow fscrypt_mount_metadata_encrypted to be called more than once"

5 years ago · 69199c70ec
parent 3fc3d75eb0 f850e6e564
commit 69199c70ec
1 changed files with 1 additions and 1 deletions
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@ -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;
    }