Merge "Keystore 2.0: Enable keystore2 by default" into rvc-qpr-dev-plus-aosp

This commit is contained in:
TreeHugger Robot 2021-03-19 15:05:00 +00:00 committed by Android (Google) Code Review
commit 7830c4a383
1 changed files with 0 additions and 4 deletions

View File

@ -401,8 +401,4 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects)
# This property allows enabling Keystore 2.0 selectively for testing.
# TODO Remove when Keystore 2.0 migration is complete. b/171563717
PRODUCT_SYSTEM_PROPERTIES += persist.android.security.keystore2.enable=false
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)