Port Identity Credential HAL to AIDL.
Bug: 111446262
Test: atest android.security.identity.cts
Test: VtsHalIdentityTargetTest
Test: android.hardware.identity-support-lib-test
Change-Id: I3fd082268d55e65b3cf1c7d7ab7dea542a19acc3
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 2d728e9..100695b 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -185,15 +185,6 @@
</hal>
-->
<hal format="hidl">
- <name>android.hardware.identity</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IIdentityCredentialStore</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.keymaster</name>
<transport>hwbinder</transport>
<version>4.1</version>
diff --git a/shared/device.mk b/shared/device.mk
index 2e08b55..a1219e4 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -288,7 +288,7 @@
# Identity Credential
PRODUCT_PACKAGES += \
- android.hardware.identity@1.0-service.example
+ android.hardware.identity-service.example
# Input Classifier HAL
PRODUCT_PACKAGES += \
diff --git a/tests/hal/hal_implementation_test.cpp b/tests/hal/hal_implementation_test.cpp
index 95392a0..42b8535 100644
--- a/tests/hal/hal_implementation_test.cpp
+++ b/tests/hal/hal_implementation_test.cpp
@@ -100,6 +100,13 @@
// types-only packages, which never expect a default implementation
"android.hardware.common.NativeHandle",
"android.hardware.graphics.common.ExtendableType",
+
+ // These KeyMaster types are in an AIDL types-only HAL because they're used
+ // by the Identity Credential AIDL HAL. Remove this when fully porting
+ // KeyMaster to AIDL.
+ "android.hardware.keymaster.HardwareAuthToken",
+ "android.hardware.keymaster.HardwareAuthenticatorType",
+ "android.hardware.keymaster.Timestamp",
};
// AOSP packages which are never considered
