From e59cda1c581e3d6367fe43df496cdc7109820c66 Mon Sep 17 00:00:00 2001 From: George Chang Date: Fri, 29 Apr 2022 23:55:32 +0800 Subject: [PATCH] Revert "Switch NFC from HIDL to AIDL" This reverts commit fab20f9417e62e932b5a001fa5e0e98a82930bc3. Reason for revert: Broken tests Bug: 230834308 Change-Id: Id25e27f37f1c3d727fa4943587ce3f57a20791b8 --- device-bluejay.mk | 3 ++- nfc/libnfc-hal-st-GB17L.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 652b4cc..cf052b5 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -97,7 +97,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -109,6 +109,7 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ + device/google/bluejay/nfc/manifest_nfc.xml \ device/google/bluejay/nfc/manifest_se_bluejay.xml # PowerStats HAL diff --git a/nfc/libnfc-hal-st-GB17L.conf b/nfc/libnfc-hal-st-GB17L.conf index ef1a858..ed77586 100644 --- a/nfc/libnfc-hal-st-GB17L.conf +++ b/nfc/libnfc-hal-st-GB17L.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index b7599c7..0035a70 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" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P