commit 6c444eebdfeadacccddb38d952e818ed5a994550
author [6;7~ <paulcrowley@google.com> Wed Aug 11 12:40:26 2021 -0700
committer Paul Crowley <paulcrowley@google.com> Wed Aug 11 21:41:16 2021 +0000
tree edab87e670b54da6c3656c88f8075e89c100218b
parent ed31b7318f8075ca847eace93975c63739df8193

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

diff --git a/device.mk b/device.mk
index 3a27ccb..fbfa11e 100644
--- a/device.mk
+++ b/device.mk
@@ -1142,3 +1142,6 @@
 # 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