gs101: remove unneeded crypto properties

It is unnessary to set ro.crypto.dm_default_key.options_format.version=2
or ro.crypto.volume.filenames_mode=aes-256-cts on devices with
PRODUCT_SHIPPING_API_LEVEL >= 30, since in that case these settings are
already the default.

Bug: 181883233
Change-Id: I4da3ce857a45c479e5efcee481f74031093234d8
This commit is contained in:
Eric Biggers 2021-03-08 10:17:55 -08:00
parent 75657e2f0e
commit 3014832d9a

View file

@ -61,17 +61,6 @@ LOCAL_USES_SDMMC_BOOT := false
LOCAL_USES_UFS_BOOT := true LOCAL_USES_UFS_BOOT := true
LOCAL_USES_EMMC_BOOT := false LOCAL_USES_EMMC_BOOT := false
# Metadata Encryption
# Because the kernel interface to dm-default-key changed in Android R,
# you also need to ensure that you have set the correct value for
# PRODUCT_SHIPPING_API_LEVEL in device.mk. For example, if your device
# launches with Android R (API level 30), device.mk should contain:
# PRODUCT_SHIPPING_API_LEVEL := 30
# You can also set the following system property to force the use of
# the new dm-default-key API regardless of shipping API level:
PRODUCT_PROPERTY_OVERRIDES += \
ro.crypto.dm_default_key.options_format.version=2
# OEM Unlock reporting # OEM Unlock reporting
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1 ro.oem_unlock_supported=1
@ -281,9 +270,6 @@ PRODUCT_PACKAGES += \
tune2fs.vendor_ramdisk \ tune2fs.vendor_ramdisk \
resize2fs.vendor_ramdisk resize2fs.vendor_ramdisk
PRODUCT_PROPERTY_OVERRIDES += \
ro.crypto.volume.filenames_mode=aes-256-cts
# Userdata Checkpointing OTA GC # Userdata Checkpointing OTA GC
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
checkpoint_gc checkpoint_gc