commit 1c25f977f7ec0cb3910caf8d0b17ea3606ff2149
author Paul Crowley <paulcrowley@google.com> Tue Aug 10 13:42:24 2021 -0700
committer Paul Crowley <paulcrowley@google.com> Wed Aug 11 10:15:32 2021 -0700
tree e37d50bfab5619b66ff3549cfb9b7bd6c65cc919
parent afdc16aa19bf1a9cc6bff3029c6974c312b93bf2

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 Cuttlefish twice
Merged-In: I4312b9a11b4fbc2f806c0ea2fcb74f88d81e4274
Change-Id: I4312b9a11b4fbc2f806c0ea2fcb74f88d81e4274

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 9e90e8e..8647d01 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -142,6 +142,9 @@
 # DRM service opt-in
 PRODUCT_VENDOR_PROPERTIES += drm.service.enabled=true
 
+# Call deleteAllKeys if vold detects a factory reset
+PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled=true
+
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera/devices/EmulatedCamera