From a894a1aa66405eebd151ae61fff0fa219d720aec Mon Sep 17 00:00:00 2001 From: yuguoxu Date: Tue, 24 Sep 2019 14:52:30 +0800 Subject: [PATCH] Export vold FDE algorithm properties ro.crypto.fde_algorithm ro.crypto.fde_sector_size ro.crypto.volume.contents_mode These properties were not added to sepolicy export2vold. vold can't access crypto algorithm type when flashing a GSI image and when the properties are in /vendor/build.prop. This prevents FDE from working. Bug: 141518844 Change-Id: I234bda439f6be7a2211a194856baf75800396232 Signed-off-by: yuguoxu --- prebuilts/api/29.0/public/property_contexts | 3 +++ public/property_contexts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/prebuilts/api/29.0/public/property_contexts b/prebuilts/api/29.0/public/property_contexts index 7b2bea3cf..3509cfc12 100644 --- a/prebuilts/api/29.0/public/property_contexts +++ b/prebuilts/api/29.0/public/property_contexts @@ -111,8 +111,11 @@ ro.config.ringtone u:object_r:exported2_config_prop:s0 exact string ro.control_privapp_permissions u:object_r:exported3_default_prop:s0 exact string ro.cp_system_other_odex u:object_r:exported3_default_prop:s0 exact int ro.crypto.allow_encrypt_override u:object_r:exported2_vold_prop:s0 exact bool +ro.crypto.fde_algorithm u:object_r:exported2_vold_prop:s0 exact string +ro.crypto.fde_sector_size u:object_r:exported2_vold_prop:s0 exact int ro.crypto.scrypt_params u:object_r:exported2_vold_prop:s0 exact string ro.crypto.set_dun u:object_r:exported2_vold_prop:s0 exact bool +ro.crypto.volume.contents_mode u:object_r:exported2_vold_prop:s0 exact string ro.crypto.volume.filenames_mode u:object_r:exported2_vold_prop:s0 exact string ro.dalvik.vm.native.bridge u:object_r:exported_dalvik_prop:s0 exact string ro.enable_boot_charger_mode u:object_r:exported3_default_prop:s0 exact bool diff --git a/public/property_contexts b/public/property_contexts index e16b374c9..4418bbf65 100644 --- a/public/property_contexts +++ b/public/property_contexts @@ -110,8 +110,11 @@ ro.config.ringtone u:object_r:exported2_config_prop:s0 exact string ro.control_privapp_permissions u:object_r:exported3_default_prop:s0 exact string ro.cp_system_other_odex u:object_r:exported3_default_prop:s0 exact int ro.crypto.allow_encrypt_override u:object_r:exported2_vold_prop:s0 exact bool +ro.crypto.fde_algorithm u:object_r:exported2_vold_prop:s0 exact string +ro.crypto.fde_sector_size u:object_r:exported2_vold_prop:s0 exact int ro.crypto.scrypt_params u:object_r:exported2_vold_prop:s0 exact string ro.crypto.set_dun u:object_r:exported2_vold_prop:s0 exact bool +ro.crypto.volume.contents_mode u:object_r:exported2_vold_prop:s0 exact string ro.crypto.volume.filenames_mode u:object_r:exported2_vold_prop:s0 exact string ro.dalvik.vm.native.bridge u:object_r:exported_dalvik_prop:s0 exact string ro.enable_boot_charger_mode u:object_r:exported3_default_prop:s0 exact bool