commit b9021fcd806c47f59b7f7a40528d96d9f96501d9
author Paul Crowley <paulcrowley@google.com> Tue Apr 07 03:23:57 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 07 03:23:57 2020 +0000
tree fcd43ceebfa0fbfd448f4917787c437731f55e07
parent 6549757914549fa9dc9b7c709e324b659950d1b3
parent c115da5968a2bbd380c4282d777f2ba56021a4b1

Merge "Vendors may choose dm-default-key options format"

private/property_contexts

diff --git a/private/property_contexts b/private/property_contexts
index c488e9f..fc8f991 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -395,6 +395,7 @@
 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.dm_default_key.options_format.version 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