From 908d5c56f967ddf71caa08cc24fd7546bdc3233f Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:22:32 +0800 Subject: [PATCH 1/2] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Change-Id: I4d83f6b430cd6d4d4b1b49cd71f5e0a135655149 --- 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 f02cd87..c342eb5 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -91,7 +91,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -105,7 +105,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 f390c44..15e3a18 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -78,7 +78,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -92,7 +92,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 From 82df7ed9d247dafc72d580e32d3a9a0d2a1cb914 Mon Sep 17 00:00:00 2001 From: George Chang Date: Fri, 29 Apr 2022 23:36:15 +0800 Subject: [PATCH 2/2] Revert "Switch NFC from HIDL to AIDL" This reverts commit 908d5c56f967ddf71caa08cc24fd7546bdc3233f. Reason for revert: Broken tests Bug: 230834308 Change-Id: I2bfa841fb7af7fa963cbf270f2c9626f93d7146d --- 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, 21 insertions(+), 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index c342eb5..f02cd87 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -91,7 +91,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -105,6 +105,7 @@ 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 6f6fdcb..0356a70 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -60,7 +60,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -74,6 +74,7 @@ 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 15e3a18..f390c44 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -78,7 +78,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -92,6 +92,7 @@ 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 a749564..e4d9223 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -79,6 +79,7 @@ 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 aafe372..73b4e42 100644 --- a/manifest.xml +++ b/manifest.xml @@ -113,6 +113,15 @@ 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 feb933a..ed1f57b 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" ############################################################################### -# 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 f553e3d..60e84ac 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