tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace "flags" property with "options" with same format as fstab

Browse source 
Bug: 143307095
Test: Set override, check policy is as expected with sm set-virtual-disk
Change-Id: Iec31d7530b15d6d4564100816c821394e0708d53
This commit is contained in:
Paul Crowley 2019-10-24 22:52:02 -07:00
parent 5e53ff6e8f
commit f612b8b5ab
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
FsCrypt.cpp
View file

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