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

Merge "Switch NFC from HIDL to AIDL" into tm-qpr-dev am: 25925d0b84

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/18403437

Change-Id: I15f9d8d7f07568c2edf41c9a03a97f8802d63664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
George Chang 2022-06-01 06:39:51 +00:00 • committed by Automerger Merge Worker
commit 93f462fa23
3 changed files with 5 additions and 6 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@1.2-service.st android.hardware.nfc-service.st
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -109,7 +109,6 @@ 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"
############################################################################### ###############################################################################
# White list to be set at startup. # Allow list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0} DEVICE_HOST_ALLOW_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"
############################################################################### ###############################################################################
# White list to be set at startup. # Allow list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0} DEVICE_HOST_ALLOW_LIST={02:C0}
############################################################################### ###############################################################################
# BAIL OUT value for P2P # BAIL OUT value for P2P