commit 5810c9a8134e77284aabfcf826d1a6613e93badf
author Paul Crowley <paulcrowley@google.com> Mon Oct 28 21:23:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 28 21:23:07 2019 -0700
tree d990ed289d82e40721c1ec849ae646f01a3324ea
parent 7fa3e420b58abd8ce0d1fbb3bdd5388ea7f49e31
parent f3a6282a6338c34940983fca5f730bab01870cea

Merge changes from topics "fscrypt-options", "fstab-options" am: c17827b095 am: 18b8ad91b8 am: 2615e01740
am: f3a6282a63

Change-Id: Ibe2bb80d501c619881cc66c6b49cfcaf69a75ce2

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.