From 3014832d9a82a5b44fb46036d23d84d0bafd39ed Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 8 Mar 2021 10:17:55 -0800 Subject: [PATCH] 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 --- device.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/device.mk b/device.mk index 3acf0fca..8e30f2a8 100644 --- a/device.mk +++ b/device.mk @@ -61,17 +61,6 @@ LOCAL_USES_SDMMC_BOOT := false LOCAL_USES_UFS_BOOT := true 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 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -281,9 +270,6 @@ PRODUCT_PACKAGES += \ tune2fs.vendor_ramdisk \ resize2fs.vendor_ramdisk -PRODUCT_PROPERTY_OVERRIDES += \ - ro.crypto.volume.filenames_mode=aes-256-cts - # Userdata Checkpointing OTA GC PRODUCT_PACKAGES += \ checkpoint_gc