From 5f6dbc552d0cb68e94b81857783c88f67f28bc9c Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 26 Jan 2022 23:53:35 +0800 Subject: [PATCH] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: I33d07604e87a2d9466a3a857e281ee4b611330a8 Change-Id: I33d07604e87a2d9466a3a857e281ee4b611330a8 --- device.mk | 2 +- manifest.xml | 9 --------- nfc/libnfc-hal-st.conf | 4 ++-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/device.mk b/device.mk index 139afd5c..6982e114 100644 --- a/device.mk +++ b/device.mk @@ -445,7 +445,7 @@ PRODUCT_PACKAGES += \ NfcNci \ Tag \ SecureElement \ - android.hardware.nfc@1.2-service.st \ + android.hardware.nfc-service.st \ android.hardware.secure_element@1.0-service.st PRODUCT_COPY_FILES += \ diff --git a/manifest.xml b/manifest.xml index 1175a2a8..9b1aebfc 100644 --- a/manifest.xml +++ b/manifest.xml @@ -442,15 +442,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. default - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - android.hardware.neuralnetworks diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 97fe8b58..dc1ed58f 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -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