From 6c444eebdfeadacccddb38d952e818ed5a994550 Mon Sep 17 00:00:00 2001
From: "[6;7~" <paulcrowley@google.com>
Date: Wed, 11 Aug 2021 12:40:26 -0700
Subject: [PATCH] Enable deleteAllKeys from vold

If vold detects when setting up metadata encryption that there has been
a factory reset, call deleteAllKeys on Keystore to delete old user data.

Bug: 187105270
Test: booted Oriole twice
Change-Id: Ife779307db0fe161c8889f7aaab34e2899a6c9e6
---
 device.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/device.mk b/device.mk
index 3a27ccb9..fbfa11ee 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