commit 18b8ad91b8c773d0a8409c725eb97facc6d83d26
author Paul Crowley <paulcrowley@google.com> Mon Oct 28 19:23:05 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 28 19:23:05 2019 -0700
tree 474c2331062fd8b235be048a0e04f7ff0eb96900
parent 0ae752dcc3d918d761df96f6413cc08da3d3dfe7
parent c17827b0956935bda96ed58ce19a1d8141924746

Merge changes from topics "fscrypt-options", "fstab-options"
am: c17827b095

Change-Id: I9a992f0da7b5199b40ce650c2eb20258cab2b562

FsCrypt.cpp

diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index d1fa256..c101ba8 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -201,8 +201,11 @@
     if (entry == nullptr) {
         return;
     }
-    ParseOptionsParts(entry->file_contents_mode, entry->file_names_mode, entry->file_policy_version,
-                      options);
+    if (!ParseOptions(entry->encryption_options, options)) {
+        LOG(ERROR) << "Unable to parse encryption options for " << DATA_MNT_POINT ": "
+                   << entry->encryption_options;
+        return;
+    }
 }
 
 // Retrieve the version to use for encryption policies on the /data filesystem.