Revert "Switch NFC from HIDL to AIDL"

This reverts commit 4ffd90e138.

Reason for revert: Broken tests
Bug: 230834308

Change-Id: I93f632ed8c489300e10c1acd870fa142ba55ae6e
This commit is contained in:
George Chang 2022-04-29 15:53:03 +00:00
parent 4ffd90e138
commit 4053823d4a
7 changed files with 16 additions and 10 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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