Merge "Allow fscrypt_mount_metadata_encrypted to be called more than once" am: 69199c70ec am: c39c12d0c3 am: 4f2f5d03b1

Change-Id: Ic40fd05dd91509c1a53488d9758c9fa39a7e0b84
5 years ago · 0aeb0c388e
parent b4569d73ee 4f2f5d03b1
commit 0aeb0c388e
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;
    }