commit 4f2f5d03b1f932064ea199bf2976c47c459d14dd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 11 19:09:42 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 11 19:09:42 2019 +0000
tree 43baec0d7da0285e9ec355150cc0d48c1f73f40b
parent 9586a3dd1b00f3760ec9252cca219e0bdd7adc6c
parent c39c12d0c31b37387b087f525aa833afe468c46f

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

Change-Id: I075c96eff7910c7a68c295ecf5f887b9deb929c0

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index abcf6db..3c2e0d5 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -189,7 +189,7 @@
                                       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;
     }