diff options
author | Shawn Willden <swillden@google.com> | 2021-08-13 22:23:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-08-13 22:23:17 +0000 |
commit | 548474ce340ac836b13ae6bdcb366bd1088b6124 (patch) | |
tree | d9959de2be0eec844415f05bbb7229eb20ab0eb9 | |
parent | 92260a5446da1eea874fa05d47852097f18b30c6 (diff) | |
parent | 7e46d7032d316719e3d737924c69acde664281af (diff) | |
download | cuttlefish-548474ce340ac836b13ae6bdcb366bd1088b6124.tar.gz |
Merge "Revert^2 "Enable deleteAllKeys from vold"" into sc-dev
-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 |