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

Merge "Switch NFC from HIDL to AIDL" into tm-d1-dev am: 1fac8143e4

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

Change-Id: Id01e271b8cf7e903b1bb5c58647653a858063a6f
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:40:55 +00:00 • committed by Automerger Merge Worker
commit 376d89791a
3 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
device-felix.mk
View file

@ -85,7 +85,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 += \
@ -99,7 +99,6 @@ PRODUCT_COPY_FILES += \
device/google/felix/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf device/google/felix/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/felix/nfc/manifest_nfc.xml \
device/google/felix/nfc/manifest_se.xml device/google/felix/nfc/manifest_se.xml
# Power HAL config # Power HAL config

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

11
nfc/manifest_nfc.xml
View file

@ -1,11 +0,0 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INfc</name>
<instance>default</instance>
</interface>
</hal>
</manifest>