Switch NFC from HIDL to AIDL

Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Merged-In: I33d07604e87a2d9466a3a857e281ee4b611330a8
Change-Id: I33d07604e87a2d9466a3a857e281ee4b611330a8
This commit is contained in:
George Chang 2022-01-26 23:53:35 +08:00 committed by Nick Reuter
parent e2db1ff35b
commit 2a4dfa5de9
3 changed files with 3 additions and 12 deletions

View file

@ -319,7 +319,7 @@ PRODUCT_PACKAGES += \
# NFC # NFC
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.nfc@1.2-service.st \ android.hardware.nfc-service.st \
android.hardware.secure_element@1.2.vendor \ android.hardware.secure_element@1.2.vendor \
com.android.nfc_extras \ com.android.nfc_extras \
nfc_nci.st21nfc.default \ nfc_nci.st21nfc.default \

View file

@ -81,15 +81,6 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INfc</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.radio</name> <name>android.hardware.radio</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>

View file

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