commit f14f8627bb30ea7d656f8a55c2aa4b3aedc48b80
author Eric Biggers <ebiggers@google.com> Thu Mar 17 23:06:45 2022 +0000
committer Eric Biggers <ebiggers@google.com> Thu Mar 17 23:17:33 2022 +0000
tree 5925feea77ed2979024b72a772d8bb2765bc7f78
parent e7dbc48584e7c87a5402a0cf069d333d6da32d0d

Fix check for whether metadata encryption is enabled

metadata_key_dir controls whether metadata encryption is enabled, not
metadata_encryption which is just the encryption options and can be
empty if the default options are sufficient.

Bug: 198405417
Fixes: 156d9d229378 ("Pre-create userdata metadata encryption device.")
Change-Id: I98ee253c7e5e738ee087ec07ed60f4a376ca7cee

main.cpp

diff --git a/main.cpp b/main.cpp
index 978db66..42789c9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -251,7 +251,7 @@
             PLOG(FATAL) << "could not find logical partition " << entry.blk_device;
         }
 
-        if (entry.mount_point == "/data" && !entry.metadata_encryption.empty()) {
+        if (entry.mount_point == "/data" && !entry.metadata_key_dir.empty()) {
             // Pre-populate userdata dm-devices since the uevents are asynchronous (b/198405417).
             android::vold::defaultkey_precreate_dm_device();
         }