Evolution-X-Tensor/device_google_bluejay
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Switch NFC from HIDL to AIDL"

Browse source 
This reverts commit fab20f9417.

Reason for revert: Broken tests
Bug: 230834308

Change-Id: Id25e27f37f1c3d727fa4943587ce3f57a20791b8
This commit is contained in:
George Chang 2022-04-29 23:55:32 +08:00
parent fab20f9417
commit e59cda1c58
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
device-bluejay.mk
View file

@ -97,7 +97,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc@1.2-service.st
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -109,6 +109,7 @@ PRODUCT_COPY_FILES += \
device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/bluejay/nfc/manifest_nfc.xml \
device/google/bluejay/nfc/manifest_se_bluejay.xml device/google/bluejay/nfc/manifest_se_bluejay.xml
# PowerStats HAL # PowerStats HAL

4
nfc/libnfc-hal-st-GB17L.conf
View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc" NCI_HAL_MODULE="nfc_nci.st21nfc"
############################################################################### ###############################################################################
# Allow list to be set at startup. # White list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0} DEVICE_HOST_WHITE_LIST={02:C0}
############################################################################### ###############################################################################
# BAIL OUT value for P2P # BAIL OUT value for P2P

4
nfc/libnfc-hal-st.conf
View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc" NCI_HAL_MODULE="nfc_nci.st21nfc"
############################################################################### ###############################################################################
# Allow list to be set at startup. # White list to be set at startup.
DEVICE_HOST_ALLOW_LIST={02:C0} DEVICE_HOST_WHITE_LIST={02:C0}
############################################################################### ###############################################################################
# BAIL OUT value for P2P # BAIL OUT value for P2P