commit f3a6282a6338c34940983fca5f730bab01870cea
author Paul Crowley <paulcrowley@google.com> Mon Oct 28 21:15:25 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 28 21:15:25 2019 -0700
tree 474c2331062fd8b235be048a0e04f7ff0eb96900
parent 9c715f4b3aded2aded7286771e91ab70cf24dceb
parent 2615e017401c92f78ce63f1e8a98ff2b4b818c63

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

Change-Id: I8b2664197f51ecf3379e0de0e4303c71f0e2302b

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.