Replace gatekeeper with software HIDL service.
Make cuttlefish use the default software implementation of gatekeeper.
Test: VtsHalGatekeeperV1_0TargetTest
Also manually tested setting PIN and logging in.
Change-Id: I1e18491a9f812e0e35d9d00f603b8a313371efde
Merged-In: I1e18491a9f812e0e35d9d00f603b8a313371efde
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index d8683a2..b4912ac 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -147,15 +147,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.gatekeeper</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IGatekeeper</name>
- <instance>default</instance>
- </interface>
- </hal>
<!-- FIXME: Upgrade gnss to 1.1 -->
<hal format="hidl">
<name>android.hardware.gnss</name>
diff --git a/shared/device.mk b/shared/device.mk
index 8f4d719..3b46e56 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -258,9 +258,7 @@
# Gatekeeper
#
PRODUCT_PACKAGES += \
- gatekeeper.cutf \
- android.hardware.gatekeeper@1.0-impl \
- android.hardware.gatekeeper@1.0-service
+ android.hardware.gatekeeper@1.0-service.software
#
# GPS
diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
index 458ef85..e9cbccc 100644
--- a/shared/sepolicy/vendor/file_contexts
+++ b/shared/sepolicy/vendor/file_contexts
@@ -45,6 +45,7 @@
/vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service\.sim u:object_r:hal_bluetooth_sim_exec:s0
/vendor/bin/hw/android\.hardware\.drm@1\.1-service\.clearkey u:object_r:hal_drm_default_exec:s0
/vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service\.cuttlefish u:object_r:hal_dumpstate_impl_exec:s0
+/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0
/vendor/bin/hw/android\.hardware\.health@2\.0-service.cuttlefish u:object_r:hal_health_default_exec:s0
/vendor/bin/hw/android\.hardware\.health\.storage@1\.0-service.cuttlefish u:object_r:hal_health_storage_default_exec:s0
/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-sample-.* u:object_r:hal_neuralnetworks_sample_exec:s0
