From 4053823d4a03b825fc64d902d1e7aa48a5851020 Mon Sep 17 00:00:00 2001 From: George Chang Date: Fri, 29 Apr 2022 15:53:03 +0000 Subject: [PATCH] Revert "Switch NFC from HIDL to AIDL" This reverts commit 4ffd90e138f7a4d9eee180c372d912043ec57336. Reason for revert: Broken tests Bug: 230834308 Change-Id: I93f632ed8c489300e10c1acd870fa142ba55ae6e --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- device-slider.mk | 3 ++- device-whitefin.mk | 5 ++++- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4df1b54..b6cacb7 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -116,7 +116,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -130,6 +130,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-raven.mk b/device-raven.mk index 09c44ab..06bd62d 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -131,7 +131,7 @@ endif PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -145,6 +145,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml diff --git a/device-slider.mk b/device-slider.mk index 631ee09..647ee73 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -97,6 +97,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # PowerStats HAL diff --git a/device-whitefin.mk b/device-whitefin.mk index e55b62a..577092e 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -76,7 +76,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st + +DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf index 3b3e1ee..5fdaf5e 100644 --- a/nfc/libnfc-hal-st-debug.conf +++ b/nfc/libnfc-hal-st-debug.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-disable.conf b/nfc/libnfc-hal-st-disable.conf index 165665e..2b455df 100644 --- a/nfc/libnfc-hal-st-disable.conf +++ b/nfc/libnfc-hal-st-disable.conf @@ -64,8 +64,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