From dc854af286273f567251e7dcf99069845bfe411d Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Thu, 12 Aug 2021 01:03:12 +0000 Subject: [PATCH] Revert "Enable deleteAllKeys from vold" Revert "Detect factory reset and deleteAllKeys" Revert "Add deleteAllKeys to IKeystoreMaintenance" Revert "Enable deleteAllKeys from vold" Revert "Allow vold to deleteAllKeys in Keystore" Revert submission 15521094-vold-deleteAllKeys Reason for revert: Causes infinite loop in Trusty KeyMint Reverted Changes: I9c5c54714:Detect factory reset and deleteAllKeys I2fb0e94db:Allow vold to deleteAllKeys in Keystore Id23f25c69:Add deleteAllKeys to IKeystoreMaintenance Ife779307d:Enable deleteAllKeys from vold I4312b9a11:Enable deleteAllKeys from vold Bug: 187105270 Change-Id: I0a236e0308b9b8354e669b9261fc22a88a01f743 --- device.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/device.mk b/device.mk index fbfa11ee..3a27ccb9 100644 --- a/device.mk +++ b/device.mk @@ -1142,6 +1142,3 @@ PRODUCT_COPY_FILES += \ # Use 64-bit dex2oat for better dexopt time. PRODUCT_PROPERTY_OVERRIDES += \ dalvik.vm.dex2oat64.enabled=true - -# Call deleteAllKeys if vold detects a factory reset -PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled=true