commit 88a0602582eb7356e6591bbd3cefbb985f20446e
author Janis Danisevskis <jdanis@google.com> Wed Mar 10 14:46:09 2021 -0800
committer Janis Danisevskis <jdanis@google.com> Wed Mar 17 08:47:55 2021 -0700
tree ac29ac7ac6c79240d4fa5e95a10a064efe285fba
parent 69973f0aa1516132e659016f7517de9d39aa736c

Keystore 2.0: Enable keystore2 by default

Bug: 170144267
Test: N/A
Merged-In: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578
Change-Id: Id9f39dc5189b7eda4617328c41a4ac4d4e3af578

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 09864bc..c87fb73 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -403,6 +403,6 @@
 
 # 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
+PRODUCT_SYSTEM_PROPERTIES += persist.android.security.keystore2.enable=true
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)