Turn on software Keymint
This change re-enables software Keymint in CF
Test: Pin lock can be set
Change-Id: I609d29a7380244dbfb48325c7cba069535de2826
Merged-In: I609d29a7380244dbfb48325c7cba069535de2826
diff --git a/shared/device.mk b/shared/device.mk
index f954bc8..613b116 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -522,8 +522,8 @@
ifeq ($(LOCAL_KEYMINT_PRODUCT_PACKAGE),)
LOCAL_KEYMINT_PRODUCT_PACKAGE := android.hardware.security.keymint-service
endif
-# PRODUCT_PACKAGES += \
-# $(LOCAL_KEYMINT_PRODUCT_PACKAGE)
+ PRODUCT_PACKAGES += \
+ $(LOCAL_KEYMINT_PRODUCT_PACKAGE)
#
# Power HAL
diff --git a/tests/hal/hal_implementation_test.cpp b/tests/hal/hal_implementation_test.cpp
index d94d56f..471aebb 100644
--- a/tests/hal/hal_implementation_test.cpp
+++ b/tests/hal/hal_implementation_test.cpp
@@ -106,15 +106,6 @@
// KeyMaster to AIDL.
"android.hardware.keymaster.",
- // Temporarily disable keymint, secureclock, and shared secret in favor of
- // keymaster 4.1. This is required for the transition to Keystore 2.0.
- // Software keymint does not work with Gatekeeper. This can be removed when
- // the remote keymaster implementation was ported to keymint.
- // b/182928606
- "android.hardware.security.keymint.",
- "android.hardware.security.secureclock.",
- "android.hardware.security.sharedsecret.",
-
// These types are only used in Automotive.
"android.automotive.computepipe.registry.",
"android.automotive.computepipe.runner.",
