From aa8d517d9b36ef64f06e975f1eae6164be3b3d65 Mon Sep 17 00:00:00 2001 From: bigbiff Date: Fri, 5 Nov 2021 18:58:37 +0000 Subject: [PATCH] Revert "checkpoint: check checkpoint instead of assuming" This reverts commit c0228607f340461e2e0448fabbba32756d1c2807. Reason for revert: It seems necessary to force checkpoint. Change-Id: I6889027538c0656b3689e008b03c1812317b22e6 --- crypto/fscrypt/MetadataCrypt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/fscrypt/MetadataCrypt.cpp b/crypto/fscrypt/MetadataCrypt.cpp index e9b19672..853e81eb 100755 --- a/crypto/fscrypt/MetadataCrypt.cpp +++ b/crypto/fscrypt/MetadataCrypt.cpp @@ -174,7 +174,7 @@ static bool read_key(const std::string& metadata_key_dir, const KeyGeneration& g unlink(newKeyPath.c_str()); } bool needs_cp = cp_needsCheckpoint(); - if (!retrieveOrGenerateKey(dir, temp, kEmptyAuthentication, gen, key, needs_cp)) return false; + if (!retrieveOrGenerateKey(dir, temp, kEmptyAuthentication, gen, key, true)) return false; if (needs_cp && pathExists(newKeyPath)) std::thread(commit_key, dir).detach(); return true; }