commit d908d2edd43d37d89468f4d9d4d50b07231a7805
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 19 04:42:12 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Mar 19 04:42:12 2022 +0000
tree 7120f9d5b7a3e5cd99a354bb9add719a16b31129
parent 06505f7abb4ea009707e6d5041fb2dc5f3d56251
parent 5a91b7151eadef2a888ec132519bdc10efe1be22

Merge changes from topic "metadata_encryption_options" am: 10ca7def20 am: 09c6fcafa0 am: 5a91b7151e

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2030589

Change-Id: I094284b2d4b5667a845460b2fd05e07e0ec149fe

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index bd3c0ef..5c9e644 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -261,7 +261,7 @@
 
     CryptoOptions options;
     if (options_format_version == 1) {
-        if (!data_rec->metadata_encryption.empty()) {
+        if (!data_rec->metadata_encryption_options.empty()) {
             LOG(ERROR) << "metadata_encryption options cannot be set in legacy mode";
             return false;
         }
@@ -274,7 +274,7 @@
             return false;
         }
     } else if (options_format_version == 2) {
-        if (!parse_options(data_rec->metadata_encryption, &options)) return false;
+        if (!parse_options(data_rec->metadata_encryption_options, &options)) return false;
     } else {
         LOG(ERROR) << "Unknown options_format_version: " << options_format_version;
         return false;

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();
         }