Switch NFC from HIDL to AIDL

Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Merged-In: Id3f65723c6240bbae6f6cc92e7ee57e07e1f0974
Change-Id: Id3f65723c6240bbae6f6cc92e7ee57e07e1f0974
This commit is contained in:
George Chang 2022-05-05 01:41:30 +08:00
parent b1a045dcf3
commit 9782bbc0ca
3 changed files with 3 additions and 15 deletions

View File

@ -59,7 +59,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
android.hardware.nfc@1.2-service.st
android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@ -73,7 +73,6 @@ PRODUCT_COPY_FILES += \
device/google/lynx/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
device/google/lynx/nfc/manifest_nfc.xml \
device/google/lynx/nfc/manifest_se.xml
# Thermal Config

View File

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc"
###############################################################################
# White list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0}
# ALLOW list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0}
###############################################################################
# BAIL OUT value for P2P

View File

@ -1,11 +0,0 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INfc</name>
<instance>default</instance>
</interface>
</hal>
</manifest>