From 80db0638d742ffc2f78859f78d5405827038b4c1 Mon Sep 17 00:00:00 2001
From: Paul Crowley <paulcrowley@google.com>
Date: Thu, 12 Aug 2021 19:20:40 +0000
Subject: [PATCH] Revert^2 "Enable deleteAllKeys from vold"

Revert of cac9588d7ee8d3e5bfa684cd0bb92db80ac3bac4
aka I0a236e0308b9b8354e669b9261fc22a88a01f743
re-landing change Ife779307db0fe161c8889f7aaab34e2899a6c9e6

Bug: 187105270
Change-Id: I2981420841f2ecdc67a36f9a8c7b81bad00bfe96
---
 device.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/device.mk b/device.mk
index 21826af8..99a420eb 100644
--- a/device.mk
+++ b/device.mk
@@ -1142,3 +1142,6 @@ 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