commit a50f6c3c2cd5f566b0969e7c8c8a023f96e95b6a
author Paul Crowley <paulcrowley@google.com> Thu Oct 24 23:21:44 2019 -0700
committer Paul Crowley <paulcrowley@google.com> Mon Oct 28 13:36:35 2019 -0700
tree f7fa079cfc9c1b51837f7a3df4c252e7cdc8f960
parent f612b8b5ab3a1deacc2c806c6261f7f2a6491924

Use new encryption_options fstab entry

Bug: 143307095
Test: change cuttlefish fstab
Change-Id: Ia40daafc9b573c40f29c74dc2ef513fba3fc2bf9

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.