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
This commit is contained in:
George Chang 2022-05-19 13:38:21 +00:00
parent 531b2600a5
commit 33af5d261f
7 changed files with 16 additions and 10 deletions

View file

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

View file

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

View file

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

View file

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

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