From 33af5d261fe8245d2bb1a4c43b2f45fa0c25da4a Mon Sep 17 00:00:00 2001 From: George Chang Date: Thu, 19 May 2022 13:38:21 +0000 Subject: [PATCH] Revert "Switch NFC from HIDL to AIDL" Revert "Update nfc from hidl to aidl service" Revert submission 2098739-nfc_aidl_switch_gs101 Reason for revert: broken tests Reverted Changes: Ifde6ab418:Switch NFC from HIDL to AIDL I288474f69:Update nfc from hidl to aidl service Bug: 233194621 Change-Id: Ic905a34265439db0f3d24c3514686cac52d99edb --- 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 0981059..33d2c3b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -110,7 +110,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -122,6 +122,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.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 eb39732..5878bf0 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -125,7 +125,7 @@ endif PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -137,6 +137,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-slider.mk b/device-slider.mk index 0657a86..72fa1ec 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -96,6 +96,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 06613a6..370f885 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -75,7 +75,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