Replace "flags" property with "options" with same format as fstab am: f612b8b5ab am: 0ae752dcc3

am: d9261cd394

Change-Id: I0c25c833a30130c3a5aa3a47f260351734332dd4

FsCrypt.cpp

@@ -214,10 +214,13 @@ static int get_data_file_policy_version(void) {
 
 // Retrieve the options to use for encryption policies on adoptable storage.
 static bool get_volume_file_encryption_options(EncryptionOptions* options) {
-    return ParseOptionsParts(
-            android::base::GetProperty("ro.crypto.volume.contents_mode", "aes-256-xts"),
-            android::base::GetProperty("ro.crypto.volume.filenames_mode", "aes-256-heh"),
-            android::base::GetProperty("ro.crypto.volume.flags", "v1"), options);
+    auto contents_mode =
+            android::base::GetProperty("ro.crypto.volume.contents_mode", "aes-256-xts");
+    auto filenames_mode =
+            android::base::GetProperty("ro.crypto.volume.filenames_mode", "aes-256-heh");
+    return ParseOptions(android::base::GetProperty("ro.crypto.volume.options",
+                                                   contents_mode + ":" + filenames_mode + ":v1"),
+                        options);
 }
 
 // Install a key for use by encrypted files on the /data filesystem.