diff options
| author | Paul Crowley <paulcrowley@google.com> | 2021-08-10 13:42:24 -0700 |
|---|---|---|
| committer | Paul Crowley <paulcrowley@google.com> | 2021-08-11 10:15:32 -0700 |
| commit | 1c25f977f7ec0cb3910caf8d0b17ea3606ff2149 (patch) | |
| tree | e37d50bfab5619b66ff3549cfb9b7bd6c65cc919 | |
| parent | afdc16aa19bf1a9cc6bff3029c6974c312b93bf2 (diff) | |
| download | cuttlefish-1c25f977f7ec0cb3910caf8d0b17ea3606ff2149.tar.gz | |
Enable deleteAllKeys from voldandroid12-dev
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
| -rw-r--r-- | shared/device.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/shared/device.mk b/shared/device.mk index 9e90e8e7f..8647d0175 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -142,6 +142,9 @@ PRODUCT_PACKAGES += androidx.camera.extensions.impl sample_camera_extensions.xml # 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 |