diff options
| author | Shawn Willden <swillden@google.com> | 2021-08-13 22:44:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 22:44:09 +0000 |
| commit | 51e6cf76bbca3c5794862b1ad194a60086fcee35 (patch) | |
| tree | d9959de2be0eec844415f05bbb7229eb20ab0eb9 | |
| parent | dfbcf948d2aeadc83fc069569242c152e915e399 (diff) | |
| parent | 548474ce340ac836b13ae6bdcb366bd1088b6124 (diff) | |
| download | cuttlefish-51e6cf76bbca3c5794862b1ad194a60086fcee35.tar.gz | |
Merge "Revert^2 "Enable deleteAllKeys from vold"" into sc-dev am: 548474ce34
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish/+/15547743
Change-Id: If90c5489d72720cb98eb8c5e3c07d44de86805e5
| -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 |