From 17a923dc3766047bafb17961443f74616baaccb7 Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:22:32 +0800 Subject: [PATCH] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: Ieb8be71d3ac4e8e187d8fcc2e3843bfd17112a73 Change-Id: Ieb8be71d3ac4e8e187d8fcc2e3843bfd17112a73 --- device-cheetah.mk | 3 +-- device-cloudripper.mk | 3 +-- device-panther.mk | 3 +-- device-ravenclaw.mk | 3 +-- manifest.xml | 9 --------- nfc/libnfc-hal-st-proto1.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 8 insertions(+), 21 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 27648a8..8585ea1 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -103,7 +103,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -117,7 +117,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 0356a70..6f6fdcb 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -60,7 +60,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -74,7 +74,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-panther.mk b/device-panther.mk index 652437f..404c3e6 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -85,7 +85,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -99,7 +99,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index e4d9223..a749564 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -79,7 +79,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/manifest.xml b/manifest.xml index 73b4e42..aafe372 100644 --- a/manifest.xml +++ b/manifest.xml @@ -113,15 +113,6 @@ hwbinder @1.3::IDevice/google-edgetpu - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - android.hardware.health hwbinder diff --git a/nfc/libnfc-hal-st-proto1.conf b/nfc/libnfc-hal-st-proto1.conf index ed1f57b..feb933a 100644 --- a/nfc/libnfc-hal-st-proto1.conf +++ b/nfc/libnfc-hal-st-proto1.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 diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 60e84ac..f553e3d 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